@f3liz/rescript-autogen-openapi 0.1.7 → 0.3.0

package/lib/es6/src/generators/ComponentSchemaGenerator.mjs

@@ -1,6 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Pipeline from "../core/Pipeline.mjs";
+import * as Toposort from "../bindings/Toposort.mjs";
 import * as FileSystem from "../core/FileSystem.mjs";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as CodegenUtils from "../core/CodegenUtils.mjs";
@@ -29,8 +30,7 @@ function extractReferencedSchemaNames(_irType) {
       case "Intersection" :
         return irType._0.flatMap(extractReferencedSchemaNames);
       case "Reference" :
-        let parts = irType._0.split("/");
-        return [Stdlib_Option.getOr(parts[parts.length - 1 | 0], "")];
+        return [irType._0];
       case "Option" :
         _irType = irType._0;
         continue;
@@ -56,7 +56,8 @@ function generate(spec, outputDir) {
     s.name,
     s
   ]));
-  let dependencyMap = Stdlib_Array.reduce(schemas, {}, (acc, schema) => {
+  let allNodes = schemas.map(s => s.name);
+  let edges = schemas.flatMap(schema => {
     let references = extractReferencedSchemaNames(schema.type_).filter(name => {
       if (name in schemaNameMap) {
         return name !== schema.name;
@@ -64,50 +65,131 @@ function generate(spec, outputDir) {
         return false;
       }
     });
-    acc[schema.name] = references;
-    return acc;
+    return references.map(dep => [
+      schema.name,
+      dep
+    ]);
   });
-  let sortedSchemas = [];
-  let inDegreeMap = Stdlib_Array.reduce(schemas, {}, (acc, schema) => {
-    let degree = Stdlib_Option.mapOr(dependencyMap[schema.name], 0, prim => prim.length);
-    acc[schema.name] = degree;
-    return acc;
-  });
-  let queue = schemas.filter(schema => Stdlib_Option.getOr(inDegreeMap[schema.name], 0) === 0);
-  while (queue.length !== 0) {
-    let v = queue.shift();
-    let schema = v !== undefined ? v : schemas[0];
-    sortedSchemas.push(schema);
-    schemas.forEach(otherSchema => {
-      let dependsOnCurrent = Stdlib_Option.getOr(dependencyMap[otherSchema.name], []).some(name => name === schema.name);
-      if (!dependsOnCurrent) {
+  let sortedNames;
+  try {
+    sortedNames = Toposort.sortArray(allNodes, edges).toReversed();
+  } catch (exn) {
+    let visited = {};
+    let inStack = {};
+    let cycleEdges = [];
+    let dfs = node => {
+      if (Stdlib_Option.getOr(inStack[node], false) || Stdlib_Option.getOr(visited[node], false)) {
         return;
-      }
-      let currentDegree = Stdlib_Option.getOr(inDegreeMap[otherSchema.name], 0);
-      let newDegree = currentDegree - 1 | 0;
-      inDegreeMap[otherSchema.name] = newDegree;
-      if (newDegree === 0) {
-        queue.push(otherSchema);
+      } else {
+        visited[node] = true;
+        inStack[node] = true;
+        edges.forEach(param => {
+          let from = param[0];
+          if (from !== node) {
+            return;
+          }
+          let to = param[1];
+          if (Stdlib_Option.getOr(inStack[to], false)) {
+            cycleEdges.push([
+              from,
+              to
+            ]);
+            return;
+          } else {
+            return dfs(to);
+          }
+        });
+        inStack[node] = false;
         return;
       }
+    };
+    allNodes.forEach(dfs);
+    let nonCycleEdges = edges.filter(param => {
+      let to = param[1];
+      let from = param[0];
+      return !cycleEdges.some(param => {
+        if (param[0] === from) {
+          return param[1] === to;
+        } else {
+          return false;
+        }
+      });
     });
-  };
-  let sortedNames = sortedSchemas.map(s => s.name);
-  let remainingSchemas = schemas.filter(s => !sortedNames.some(name => name === s.name)).toSorted((a, b) => Primitive_string.compare(a.name, b.name));
-  let finalSortedSchemas = sortedSchemas.concat(remainingSchemas);
+    try {
+      sortedNames = Toposort.sortArray(allNodes, nonCycleEdges).toReversed();
+    } catch (exn$1) {
+      sortedNames = allNodes.toSorted(Primitive_string.compare);
+    }
+  }
+  let finalSortedSchemas = Stdlib_Array.filterMap(sortedNames, name => schemaNameMap[name]);
   let availableSchemaNames = finalSortedSchemas.map(s => s.name);
   let warnings = match[1].slice();
+  let selfRefSchemas = {};
+  finalSortedSchemas.forEach(schema => {
+    let refs = extractReferencedSchemaNames(schema.type_);
+    if (refs.some(name => name === schema.name)) {
+      selfRefSchemas[schema.name] = true;
+      return;
+    }
+  });
   let moduleCodes = finalSortedSchemas.map(schema => {
-    let typeCtx = GenerationContext.make(`ComponentSchemas.` + schema.name, true, availableSchemaNames, undefined, undefined);
-    let schemaCtx = GenerationContext.make(`ComponentSchemas.` + schema.name, true, availableSchemaNames, undefined, undefined);
-    let typeCode = IRToTypeGenerator.generateTypeWithContext(typeCtx, 0, schema.type_);
-    let schemaCode = IRToSuryGenerator.generateSchemaWithContext(schemaCtx, 0, schema.type_);
+    let isSelfRef = Stdlib_Option.getOr(selfRefSchemas[schema.name], false);
+    let selfRefName = isSelfRef ? schema.name : undefined;
+    let typeCtx = GenerationContext.make(`ComponentSchemas.` + schema.name, true, availableSchemaNames, undefined, selfRefName, undefined);
+    let typeCode = IRToTypeGenerator.generateTypeWithContext(typeCtx, 0, undefined, schema.type_);
+    let processed = 0;
+    while (processed < typeCtx.extractedTypes.length) {
+      let idx = processed;
+      let match = typeCtx.extractedTypes[idx];
+      let irType = match.irType;
+      if (match.isUnboxed && typeof irType === "object" && irType.TAG === "Union") {
+        irType._0.forEach(memberType => {
+          IRToTypeGenerator.generateTypeWithContext(typeCtx, 0, true, memberType);
+        });
+      } else {
+        IRToTypeGenerator.generateTypeWithContext(typeCtx, 0, false, irType);
+      }
+      processed = idx + 1 | 0;
+    };
+    let allExtracted = typeCtx.extractedTypes.slice().toReversed();
+    let extractedTypeMap = allExtracted.length !== 0 ? allExtracted : undefined;
+    let schemaCtx = GenerationContext.make(`ComponentSchemas.` + schema.name, true, availableSchemaNames, undefined, selfRefName, undefined);
+    let schemaCode = IRToSuryGenerator.generateSchemaWithContext(schemaCtx, 0, extractedTypeMap, schema.type_);
     warnings.push(...typeCtx.warnings);
     warnings.push(...schemaCtx.warnings);
+    let extractedTypeDefs = allExtracted.map(param => {
+      let irType = param.irType;
+      let typeName = param.typeName;
+      let auxTypeCode;
+      if (param.isUnboxed) {
+        let exit = 0;
+        if (typeof irType !== "object" || irType.TAG !== "Union") {
+          exit = 1;
+        } else {
+          let body = IRToTypeGenerator.generateUnboxedVariantBody(typeCtx, irType._0);
+          auxTypeCode = `@unboxed type ` + typeName + ` = ` + body;
+        }
+        if (exit === 1) {
+          let auxType = IRToTypeGenerator.generateTypeWithContext(typeCtx, 0, undefined, irType);
+          auxTypeCode = `type ` + typeName + ` = ` + auxType;
+        }
+      } else {
+        let auxType$1 = IRToTypeGenerator.generateTypeWithContext(typeCtx, 0, undefined, irType);
+        auxTypeCode = `type ` + typeName + ` = ` + auxType$1;
+      }
+      let auxSchemaCtx = GenerationContext.make(`ComponentSchemas.` + schema.name + `.` + typeName, true, availableSchemaNames, undefined, undefined, undefined);
+      let filteredMap = allExtracted.filter(param => param.typeName !== typeName);
+      let auxExtractedTypeMap = filteredMap.length !== 0 ? filteredMap : undefined;
+      let auxSchema = IRToSuryGenerator.generateSchemaWithContext(auxSchemaCtx, 0, auxExtractedTypeMap, irType);
+      return `  ` + auxTypeCode + `\n  let ` + typeName + `Schema = ` + auxSchema;
+    });
     let docComment = Stdlib_Option.mapOr(schema.description, "", d => CodegenUtils.generateDocString(undefined, d, undefined));
+    let extractedBlock = extractedTypeDefs.length !== 0 ? extractedTypeDefs.join("\n") + "\n" : "";
+    let typeKeyword = isSelfRef ? "type rec t" : "type t";
+    let finalSchemaCode = isSelfRef ? `S.recursive("` + schema.name + `", schema => ` + schemaCode + `)` : schemaCode;
     return docComment + `module ` + JsConvertCase.toPascalCase(schema.name) + ` = {
-  type t = ` + typeCode + `
-  let schema = ` + schemaCode + `
+` + extractedBlock + `  ` + typeKeyword + ` = ` + typeCode + `
+  let schema = ` + finalSchemaCode + `
 }`;
   });
   let fileHeader = CodegenUtils.generateFileHeader("Shared component schemas");
@@ -122,4 +204,4 @@ export {
   extractReferencedSchemaNames,
   generate,
 }
-/* FileSystem Not a pure module */
+/* Toposort Not a pure module */

package/lib/es6/src/generators/EndpointGenerator.mjs

@@ -26,7 +26,7 @@ function generateTypeCodeAndSchemaCode(jsonSchema, typeName, schemaName, moduleP
     name: schemaName,
     description: jsonSchema.description,
     type_: ir
-  }, undefined, undefined, modulePrefix);
+  }, undefined, undefined, modulePrefix, match$1[2]);
   return [
     match$1[0],
     match$2[0]
@@ -45,7 +45,8 @@ function generateEndpointFunction(endpoint, overrideDir, moduleName) {
   let isRequestBodyRequired = Stdlib_Option.getOr(requestBody.required, false);
   let bodyParam = hasRequestBody ? (
       isRequestBodyRequired ? `~body: ` + requestTypeName : `~body: option<` + requestTypeName + `>=?`
-    ) : "~body as _";
+    ) : "";
+  let paramSep = hasRequestBody ? ", " : "";
   let bodyValueConversion = hasRequestBody ? (
       isRequestBodyRequired ? `  let jsonBody = body->S.reverseConvertToJsonOrThrow(` + functionName + `RequestSchema)` : `  let jsonBody = body->Option.map(b => b->S.reverseConvertToJsonOrThrow(` + functionName + `RequestSchema))`
     ) : "";
@@ -86,7 +87,7 @@ function generateEndpointFunction(endpoint, overrideDir, moduleName) {
   let docComment = CodegenUtils.generateDocString(endpoint.summary, description, undefined);
   let code = `
     |` + docComment.trimEnd() + `
-    |let ` + functionName + ` = (` + bodyParam + `, ~fetch: ` + CodegenUtils.fetchTypeSignature + `): promise<` + functionName + `Response> => {
+    |let ` + functionName + ` = (` + bodyParam + paramSep + `~fetch: ` + CodegenUtils.fetchTypeSignature + `): promise<` + functionName + `Response> => {
     |` + bodyValueConversion + `
     |  fetch(
     |    ~url="` + endpoint.path + `",