@f3liz/rescript-autogen-openapi 0.5.4 → 0.6.0

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

@@ -1,7 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Templates from "../core/Templates.mjs";
+import * as Handlebars from "../bindings/Handlebars.mjs";
 import * as SpecDiffer from "../core/SpecDiffer.mjs";
-import * as CodegenUtils from "../core/CodegenUtils.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Primitive_string from "@rescript/runtime/lib/es6/Primitive_string.js";
 
@@ -84,32 +85,15 @@ function generateCompactSummary(diff) {
 }
 
 function generateMergeReport(stats, baseName, forkName) {
-  let sharedEndpoints = stats.sharedEndpointCount.toString();
-  let sharedSchemas = stats.sharedSchemaCount.toString();
-  let extensionEndpoints = stats.forkExtensionCount.toString();
-  let extensionSchemas = stats.forkSchemaCount.toString();
-  return CodegenUtils.trimMargin(`
-    |# Merge Report: ` + baseName + ` + ` + forkName + `
-    |
-    |## Shared Code
-    |
-    |- **Shared Endpoints**: ` + sharedEndpoints + `
-    |- **Shared Schemas**: ` + sharedSchemas + `
-    |
-    |## ` + forkName + ` Extensions
-    |
-    |- **Extension Endpoints**: ` + extensionEndpoints + `
-    |- **Extension Schemas**: ` + extensionSchemas + `
-    |
-    |## Summary
-    |
-    |The shared base contains ` + sharedEndpoints + ` endpoints and ` + sharedSchemas + ` schemas.
-    |
-    |` + forkName + ` adds ` + extensionEndpoints + ` endpoints and ` + extensionSchemas + ` schemas.
-    |
-    |---
-    |*Generated on ` + new Date().toISOString() + `*
-    |`, undefined);
+  return Handlebars.render(Templates.mergeReport, {
+    baseName: baseName,
+    forkName: forkName,
+    sharedEndpoints: stats.sharedEndpointCount.toString(),
+    sharedSchemas: stats.sharedSchemaCount.toString(),
+    extensionEndpoints: stats.forkExtensionCount.toString(),
+    extensionSchemas: stats.forkSchemaCount.toString(),
+    timestamp: new Date().toISOString()
+  });
 }
 
 function generateEndpointsByTagReport(endpoints) {
@@ -152,4 +136,4 @@ export {
   generateMergeReport,
   generateEndpointsByTagReport,
 }
-/* CodegenUtils Not a pure module */
+/* Handlebars Not a pure module */

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

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Templates from "../core/Templates.mjs";
+import * as Handlebars from "../bindings/Handlebars.mjs";
 import * as DocOverride from "../core/DocOverride.mjs";
 import * as CodegenUtils from "../core/CodegenUtils.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
@@ -85,22 +87,18 @@ function generateEndpointFunction(endpoint, overrideDir, moduleName) {
     description = endpoint.description;
   }
   let docComment = CodegenUtils.generateDocString(endpoint.summary, description, undefined);
-  let code = `
-    |` + docComment.trimEnd() + `
-    |let ` + functionName + ` = (` + bodyParam + paramSep + `~fetch: ` + CodegenUtils.fetchTypeSignature + `): promise<` + functionName + `Response> => {
-    |` + bodyValueConversion + `
-    |  fetch(
-    |    ~url="` + endpoint.path + `",
-    |    ~method_="` + endpoint.method.toUpperCase() + `",
-    |    ~body=` + (
-    hasRequestBody ? "Some(jsonBody)" : "None"
-  ) + `,
-    |  )->Promise.then(response => {
-    |` + responseHandling + `
-    |    ->Promise.resolve
-    |  })
-    |}`;
-  return CodegenUtils.trimMargin(code, undefined);
+  return Handlebars.render(Templates.endpointFunction, {
+    docComment: docComment,
+    functionName: functionName,
+    bodyParam: bodyParam,
+    paramSep: paramSep,
+    fetchTypeSignature: CodegenUtils.fetchTypeSignature,
+    bodyValueConversion: bodyValueConversion,
+    path: endpoint.path,
+    methodUpper: endpoint.method.toUpperCase(),
+    bodyArg: hasRequestBody ? "Some(jsonBody)" : "None",
+    responseHandling: responseHandling
+  });
 }
 
 function generateEndpointCode(endpoint, overrideDir, moduleName, modulePrefixOpt) {
@@ -132,26 +130,22 @@ function generateEndpointModule(endpoint, modulePrefixOpt) {
   let modulePrefix = modulePrefixOpt !== undefined ? modulePrefixOpt : "";
   let functionName = CodegenUtils.generateOperationName(endpoint.operationId, endpoint.path, endpoint.method);
   let header = CodegenUtils.generateFileHeader(Stdlib_Option.getOr(endpoint.summary, `API: ` + endpoint.path));
-  return CodegenUtils.trimMargin(`
-    |` + header.trimEnd() + `
-    |
-    |module ` + JsConvertCase.toPascalCase(functionName) + ` = {
-    |` + CodegenUtils.indent(generateEndpointCode(endpoint, undefined, undefined, modulePrefix), 2) + `
-    |}
-    |`, undefined);
+  return Handlebars.render(Templates.moduleWrapped, {
+    header: header.trimEnd(),
+    moduleName: JsConvertCase.toPascalCase(functionName),
+    body: CodegenUtils.indent(generateEndpointCode(endpoint, undefined, undefined, modulePrefix), 2)
+  });
 }
 
 function generateEndpointsModule(moduleName, endpoints, description, overrideDir, modulePrefixOpt) {
   let modulePrefix = modulePrefixOpt !== undefined ? modulePrefixOpt : "";
   let header = CodegenUtils.generateFileHeader(Stdlib_Option.getOr(description, `API for ` + moduleName));
   let body = endpoints.map(ep => CodegenUtils.indent(generateEndpointCode(ep, overrideDir, moduleName, modulePrefix), 2)).join("\n\n");
-  return CodegenUtils.trimMargin(`
-    |` + header.trimEnd() + `
-    |
-    |module ` + moduleName + ` = {
-    |` + body + `
-    |}
-    |`, undefined);
+  return Handlebars.render(Templates.moduleWrapped, {
+    header: header.trimEnd(),
+    moduleName: moduleName,
+    body: body
+  });
 }
 
 function generateEndpointSignature(endpoint) {
@@ -170,4 +164,4 @@ export {
   generateEndpointsModule,
   generateEndpointSignature,
 }
-/* DocOverride Not a pure module */
+/* Handlebars Not a pure module */

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

@@ -1,8 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Pipeline from "../core/Pipeline.mjs";
+import * as Templates from "../core/Templates.mjs";
 import * as Belt_Array from "@rescript/runtime/lib/es6/Belt_Array.js";
 import * as FileSystem from "../core/FileSystem.mjs";
+import * as Handlebars from "../bindings/Handlebars.mjs";
 import * as CodegenUtils from "../core/CodegenUtils.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as OpenAPIParser from "../core/OpenAPIParser.mjs";
@@ -66,19 +68,16 @@ function generateTagModuleFile(tag, endpoints, $staropt$star, $staropt$star$1, o
   let header = CodegenUtils.generateFileHeader(`API endpoints for ` + tag);
   let body = endpoints.map(endpoint => EndpointGenerator.generateEndpointCode(endpoint, overrideDir, moduleName, undefined)).join("\n\n");
   if (wrapInModule) {
-    return CodegenUtils.trimMargin(`
-      |` + header.trimEnd() + `
-      |
-      |module ` + moduleName + ` = {
-      |` + CodegenUtils.indent(body, 2) + `
-      |}
-      |`, undefined);
+    return Handlebars.render(Templates.moduleWrapped, {
+      header: header.trimEnd(),
+      moduleName: moduleName,
+      body: CodegenUtils.indent(body, 2)
+    });
   } else {
-    return CodegenUtils.trimMargin(`
-      |` + header.trimEnd() + `
-      |
-      |` + body + `
-      |`, undefined);
+    return Handlebars.render(Templates.moduleUnwrapped, {
+      header: header.trimEnd(),
+      body: body
+    });
   }
 }
 
@@ -98,29 +97,24 @@ function generateAllTagModules(endpoints, includeSchemasOpt, wrapInModuleOpt, ov
 function generateIndexModule(tags, moduleNameOpt) {
   let moduleName = moduleNameOpt !== undefined ? moduleNameOpt : "API";
   let header = CodegenUtils.generateFileHeader("Main API module index");
-  let modules = tags.toSorted(Primitive_string.compare).map(tag => {
-    let m = JsConvertCase.toPascalCase(tag);
-    return `  module ` + m + ` = ` + m;
-  }).join("\n");
-  return CodegenUtils.trimMargin(`
-    |` + header.trimEnd() + `
-    |
-    |module ` + moduleName + ` = {
-    |` + modules + `
-    |}
-    |`, undefined);
+  let tagData = tags.toSorted(Primitive_string.compare).map(tag => ({
+    modulePascal: JsConvertCase.toPascalCase(tag)
+  }));
+  return Handlebars.render(Templates.indexModule, {
+    header: header.trimEnd(),
+    moduleName: moduleName,
+    tags: tagData
+  });
 }
 
 function generateFlatModuleCode(moduleName, endpoints, overrideDir) {
   let header = CodegenUtils.generateFileHeader(`All API endpoints in ` + moduleName);
   let body = endpoints.map(endpoint => CodegenUtils.indent(EndpointGenerator.generateEndpointCode(endpoint, overrideDir, moduleName, undefined), 2)).join("\n\n");
-  return CodegenUtils.trimMargin(`
-    |` + header.trimEnd() + `
-    |
-    |module ` + moduleName + ` = {
-    |` + body + `
-    |}
-    |`, undefined);
+  return Handlebars.render(Templates.moduleWrapped, {
+    header: header.trimEnd(),
+    moduleName: moduleName,
+    body: body
+  });
 }
 
 function internalGenerateIntegratedModule(name, description, endpoints, schemas, overrideDir, isExtensionOpt, includeHeaderOpt) {
@@ -169,13 +163,11 @@ function generateCombinedModule(forkName, sharedEndpoints, extensionEndpoints, s
   let header = CodegenUtils.generateFileHeader(`Combined Shared and ` + forkName + ` extensions`);
   let shared = generateSharedModule(sharedEndpoints, sharedSchemas, overrideDir, false);
   let extension = generateExtensionModule(forkName, extensionEndpoints, extensionSchemas, overrideDir, false);
-  return CodegenUtils.trimMargin(`
-    |` + header.trimEnd() + `
-    |
-    |` + shared + `
-    |
-    |` + extension + `
-    |`, undefined);
+  return Handlebars.render(Templates.combinedModule, {
+    header: header.trimEnd(),
+    shared: shared,
+    extension: extension
+  });
 }
 
 function generateTagModuleFiles(endpoints, outputDir, wrapInModuleOpt, overrideDir) {

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

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Templates from "../core/Templates.mjs";
+import * as Handlebars from "../bindings/Handlebars.mjs";
 import * as CodegenUtils from "../core/CodegenUtils.mjs";
 import * as OpenAPIParser from "../core/OpenAPIParser.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -59,12 +61,13 @@ function generateEndpointModule(path, method, operation) {
         )
     );
   let schemasCode = generateOperationSchemas(operationId, operation);
-  return docComment + `module ` + JsConvertCase.toPascalCase(operationId) + ` = {
-` + CodegenUtils.indent(schemasCode, 2) + `
-
-  let endpoint = "` + path + `"
-  let method = #` + methodStr + `
-}`;
+  return Handlebars.render(Templates.endpointModule, {
+    docComment: docComment,
+    moduleName: JsConvertCase.toPascalCase(operationId),
+    schemasCode: CodegenUtils.indent(schemasCode, 2),
+    path: path,
+    methodStr: methodStr
+  });
 }
 
 export {
@@ -74,4 +77,4 @@ export {
   generateOperationSchemas,
   generateEndpointModule,
 }
-/* CodegenUtils Not a pure module */
+/* Handlebars Not a pure module */

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

@@ -1,30 +1,24 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Pipeline from "../core/Pipeline.mjs";
+import * as Templates from "../core/Templates.mjs";
 import * as FileSystem from "../core/FileSystem.mjs";
+import * as Handlebars from "../bindings/Handlebars.mjs";
 import * as CodegenUtils from "../core/CodegenUtils.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as OpenAPIParser from "../core/OpenAPIParser.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as JsConvertCase from "js-convert-case";
 
-let clientTypeCode = CodegenUtils.trimMargin(`
-  |type client = {
-  |  baseUrl: string,
-  |  token: option<string>,
-  |  fetch: ` + CodegenUtils.fetchTypeSignature + `,
-  |}
-  |`, undefined);
+let clientTypeCode = Handlebars.render(Templates.clientType, {
+  fetchTypeSignature: CodegenUtils.fetchTypeSignature
+});
 
 function generateConnectFunction(title) {
-  return CodegenUtils.trimMargin(`
-    |/** Create a client for ` + title + ` */
-    |let connect = (~baseUrl: string, ~token: option<string>=?, ~fetch: ` + CodegenUtils.fetchTypeSignature + `, ()): client => {
-    |  baseUrl,
-    |  token,
-    |  fetch,
-    |}
-    |`, undefined);
+  return Handlebars.render(Templates.connectFunction, {
+    title: title,
+    fetchTypeSignature: CodegenUtils.fetchTypeSignature
+  });
 }
 
 function generateWrapperFunction(endpoint, generatedModuleName) {
@@ -42,8 +36,13 @@ function generateWrapperFunction(endpoint, generatedModuleName) {
   });
   let signature = hasRequestBody ? `let ` + operationName + ` = (request: ` + generatedModuleName + `.` + operationName + `Request, ~client: client)` : `let ` + operationName + ` = (~client: client)`;
   let callArguments = hasRequestBody ? "~body=request, " : "";
-  return docComment + `  ` + signature + `: promise<` + generatedModuleName + `.` + operationName + `Response> => 
-    ` + generatedModuleName + `.` + operationName + `(` + callArguments + `~fetch=client.fetch)`;
+  return Handlebars.render(Templates.wrapperFunction, {
+    docComment: docComment,
+    signature: signature,
+    generatedModuleName: generatedModuleName,
+    operationName: operationName,
+    callArguments: callArguments
+  });
 }
 
 function generateWrapper(spec, endpoints, extensionEndpointsOpt, outputDir, wrapperModuleNameOpt, generatedModulePrefixOpt, baseModulePrefixOpt) {
@@ -75,13 +74,11 @@ function generateWrapper(spec, endpoints, extensionEndpointsOpt, outputDir, wrap
     }).join("\n\n");
     return `module ` + moduleName + ` = {\n` + wrapperFunctions + `\n}`;
   }).join("\n\n");
-  let fileContent = `// Generated thin wrapper
-
-` + clientTypeCode + `
-
-` + generateConnectFunction(spec.info.title) + `
-
-` + modulesCode;
+  let fileContent = Handlebars.render(Templates.wrapperFile, {
+    clientTypeCode: clientTypeCode,
+    connectFunctionCode: generateConnectFunction(spec.info.title),
+    modulesCode: modulesCode
+  });
   return Pipeline.fromFilesAndWarnings([{
       path: FileSystem.makePath(outputDir, wrapperModuleName + `.res`),
       content: fileContent

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

@@ -1,6 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Templates from "../core/Templates.mjs";
 import * as FileSystem from "../core/FileSystem.mjs";
+import * as Handlebars from "../bindings/Handlebars.mjs";
 import * as CodegenUtils from "../core/CodegenUtils.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as OpenAPIParser from "../core/OpenAPIParser.mjs";
@@ -41,24 +43,44 @@ function generateResponseInterface(endpoint, functionName) {
 
 function generateMethodSignature(endpoint, functionName) {
   let params = Stdlib_Option.isSome(endpoint.requestBody) ? `client: MisskeyClient, request: ` + JsConvertCase.toPascalCase(functionName) + `Request` : "client: MisskeyClient";
-  let docLines = Stdlib_Option.mapOr(endpoint.summary, [], summary => {
-    let lines = [
-      "  /**",
-      `   * ` + summary
-    ];
-    Stdlib_Option.forEach(endpoint.description, description => {
-      if (description !== summary) {
-        lines.push(`   * ` + description);
-        return;
+  let match = endpoint.summary;
+  let match$1 = endpoint.description;
+  let docLines;
+  if (match !== undefined) {
+    if (match$1 !== undefined) {
+      if (match === match$1) {
+        docLines = `  /** ` + match + ` */`;
+      } else {
+        let descLines = match$1.split("\n").map(line => {
+          if (line === "") {
+            return "   *";
+          } else {
+            return `   * ` + line;
+          }
+        });
+        docLines = `  /**\n   * ` + match + `\n   *\n` + descLines.join("\n") + `\n   */`;
+      }
+    } else {
+      docLines = `  /** ` + match + ` */`;
+    }
+  } else if (match$1 !== undefined) {
+    let lines = match$1.split("\n").map(line => {
+      if (line === "") {
+        return "   *";
+      } else {
+        return `   * ` + line;
       }
     });
-    lines.push("   */");
-    return lines;
+    docLines = `  /**\n` + lines.join("\n") + `\n   */`;
+  } else {
+    docLines = "";
+  }
+  return Handlebars.render(Templates.methodSignature, {
+    docLines: docLines,
+    functionName: functionName,
+    params: params,
+    responsePascalName: JsConvertCase.toPascalCase(functionName)
   });
-  let code = `
-    |` + docLines.join("\n") + `
-    |  ` + functionName + `(` + params + `): Promise<` + JsConvertCase.toPascalCase(functionName) + `Response>;`;
-  return CodegenUtils.trimMargin(code, undefined);
 }
 
 function generateModuleDts(moduleName, endpoints) {
@@ -72,25 +94,11 @@ function generateModuleDts(moduleName, endpoints) {
     ].filter(s => s !== "").join("\n");
   }).join("\n\n");
   let methodSignatures = endpoints.map(endpoint => generateMethodSignature(endpoint, CodegenUtils.generateOperationName(endpoint.operationId, endpoint.path, endpoint.method))).join("\n");
-  let header = CodegenUtils.trimMargin(`
-    |// TypeScript definitions for ` + moduleName + `
-    |// Generated by @f3liz/rescript-autogen-openapi
-    |// DO NOT EDIT
-    |
-    |import { MisskeyClient } from './index';
-    |import * as ComponentSchemas from './ComponentSchemas';
-    |`, undefined);
-  return CodegenUtils.trimMargin(`
-    |` + header + `
-    |
-    |` + interfaces + `
-    |
-    |export interface ` + moduleName + `Module {
-    |` + methodSignatures + `
-    |}
-    |
-    |export const ` + moduleName + `: ` + moduleName + `Module;
-    |`, undefined);
+  return Handlebars.render(Templates.moduleDts, {
+    moduleName: moduleName,
+    interfaces: interfaces,
+    methodSignatures: methodSignatures
+  });
 }
 
 function generateComponentSchemasDts(schemas) {
@@ -98,33 +106,19 @@ function generateComponentSchemasDts(schemas) {
     let schema = param[1];
     return generateTypeScriptType(param[0], schema.description, schema);
   }).join("\n\n");
-  return CodegenUtils.trimMargin(`
-    |// TypeScript definitions for ComponentSchemas
-    |// Generated by @f3liz/rescript-autogen-openapi
-    |// DO NOT EDIT
-    |
-    |` + content + `
-    |`, undefined);
+  return Handlebars.render(Templates.componentSchemasDts, {
+    content: content
+  });
 }
 
 function generateIndexDts(moduleNames) {
-  let imports = moduleNames.map(m => `import { ` + m + `Module } from './` + m + `';`).join("\n");
-  let $$exports = moduleNames.map(m => `export const ` + m + `: ` + m + `Module;`).join("\n");
-  return CodegenUtils.trimMargin(`
-    |// TypeScript definitions
-    |// Generated by @f3liz/rescript-autogen-openapi
-    |// DO NOT EDIT
-    |
-    |` + imports + `
-    |
-    |export class MisskeyClient {
-    |  constructor(baseUrl: string, token?: string);
-    |  readonly baseUrl: string;
-    |  readonly token?: string;
-    |}
-    |
-    |` + $$exports + `
-    |`, undefined);
+  let modules = moduleNames.map(m => ({
+    importLine: `import { ` + m + `Module } from './` + m + `';`,
+    exportLine: `export const ` + m + `: ` + m + `Module;`
+  }));
+  return Handlebars.render(Templates.indexDts, {
+    modules: modules
+  });
 }
 
 function generate(spec, endpoints, outputDir) {