fix parameters

Author: lastlink

src/Library.ts

@@ -16,7 +16,7 @@ import {
 } from "../deps/mermaid/src/diagram-api/detectType";
 import { log } from "../deps/mermaid/src/logger";
 import erDb from "./mermaid/src/diagrams/er/erDb";
-import { DiagramDefinition } from "./types";
+import { DiagramDefinition, MarkdownContentResponseI } from "./types";
 import { DbParser } from "./generate-sql-ddl";
 const diagrams: Record<string, DiagramDefinition> = {};
 
@@ -80,10 +80,9 @@ export const getDiagram = (name: string): DiagramDefinition => {
  * @returns
  */
 export const WriteMermaidErDiagramsToSqlFiles= async function (
-  definition: string,
-  databaseType: string
+  markdownContent: MarkdownContentResponseI
 ): Promise<string> {
-  const sqlOutputs = GenerateSqlFromMermaid(definition, databaseType);
+  const sqlOutputs = GenerateSqlFromMermaid(markdownContent);
   for (const key in sqlOutputs) {
     if (Object.prototype.hasOwnProperty.call(sqlOutputs, key)) {
       await fs.promises.writeFile(key, sqlOutputs[key]);
@@ -100,8 +99,7 @@ export const WriteMermaidErDiagramsToSqlFiles= async function (
  * @returns 
  */
 export const GenerateSqlFromMermaid = function (
-  definition: string,
-  databaseType: string
+  markdownContent: MarkdownContentResponseI
 ): Record<string, string> {
   const outputDiagrams: Record<string,string> = {};
   const parser = erParser();
@@ -134,7 +132,7 @@ export const GenerateSqlFromMermaid = function (
         "gm"
       );
       const mermaidChartsInMarkdownRegex = new RegExp(mermaidChartsInMarkdown);
-      const output = "output.sql";
+      const output = `${markdownContent.settings.outputName}.sql`;
       let outputFormat = "";
       if (!outputFormat) {
         outputFormat = path.extname(output).replace(".", "");
@@ -147,7 +145,7 @@ export const GenerateSqlFromMermaid = function (
         throw new Error("Output format must be one of \"sql\"");
       }
       const diagrams: string[][] = [];
-      const outDefinition = definition.replace(
+      const outDefinition = markdownContent.content.replace(
         mermaidChartsInMarkdownRegexGlobal,
         (mermaidMd) => {
           const regexResult = mermaidChartsInMarkdownRegex.exec(mermaidMd);
@@ -200,10 +198,10 @@ export const GenerateSqlFromMermaid = function (
                 diag = getDiagram(type);
                 const r: boolean = diag.parser.parse(md);
                 if (r) {
-                  const sqlHeader = getSqlHeader(databaseType);
+                  const sqlHeader = getSqlHeader(markdownContent.settings.database);
                   // models to sql
                   const ddlSyntax = new DbParser(
-                    databaseType,
+                    markdownContent.settings.database,
                     diag.db
                   ).getSQLDataDefinition();
 

src/index.ts

@@ -2,10 +2,11 @@
 import chalk from "chalk";
 import clear from "clear";
 import figlet from "figlet";
-import path from "path";
+// import path from "path";
 import { program } from "commander";
 import * as fs from "fs";
 import { WriteMermaidErDiagramsToSqlFiles } from "./Library";
+import { MarkdownContentResponseI, MarkdownInputSettingsI } from "./types";
 clear();
 console.log(
   chalk.red(
@@ -21,7 +22,7 @@ program
   .option("-r, --raw", "src is raw content rather than file")
   .option(
     "-o, --output <string>",
-    "Output file e.g. result becomes result-1.sql"
+    "Output file format e.g. result becomes result-1.sql"
   )
   .option(
     "-d, --database <string>",
@@ -32,38 +33,37 @@ program
 const options = program.opts();
 
 console.log("current options:");
-if (options.src) console.log("  - src");
+if (options.src) console.log(`  - src ${options.src}`);
 // else {
 //   console.log(`error: required option '-s, --src <string>' not specified`);
 //   process.exit(1);
 // }
-if (options.database) console.log("  - database");
+if (options.database) console.log(`  - database ${options.database}`);
+
+if (options.raw) console.log("  - raw true");
 
 const database: string =
   undefined === options.database ? "postgres" : options.database || "no";
 
 const output: string =
-  undefined === options.database ? "result" : options.database || "result";
+  undefined === options.output ? "output" : options.output || "result";
 
 const src: string = options.src;
 
 const isRaw = options.raw ? true : false;
 // required params, input only
 
-console.log("  - %s database", database);
+// console.log("  - %s database", database);
 
 if (!process.argv.slice(2).length) {
   program.outputHelp();
 }
 
-interface MarkdownInputSettingsI {
-  src: string;
-  isRaw: boolean;
-}
-
 const markdownFileSettings: MarkdownInputSettingsI = {
   src,
   isRaw,
+  outputName: output,
+  database
 };
 
 /**
@@ -72,7 +72,7 @@ const markdownFileSettings: MarkdownInputSettingsI = {
  */
 async function LoadMarkDownFile(
   inputInformation: MarkdownInputSettingsI
-): Promise<string> {
+): Promise<MarkdownContentResponseI> {
   let fileContents: string | null = null;
   if (inputInformation.isRaw) {
     fileContents = inputInformation.src;
@@ -83,13 +83,16 @@ async function LoadMarkDownFile(
     }
     fileContents = await fs.readFileSync(inputInformation.src, "utf8");
   }
-  return fileContents;
+  return {
+    settings: inputInformation,
+    content: fileContents
+  };
 }
 
 LoadMarkDownFile(markdownFileSettings)
-  .then(async (contents) => {
+  .then(async (response) => {
     console.log("done loading file");
-    await WriteMermaidErDiagramsToSqlFiles(contents, options.database).then((result) => {
+    await WriteMermaidErDiagramsToSqlFiles(response).then((result) => {
       console.log(result);
       console.log("done generating sql");
     });

src/types/index.ts

@@ -1,3 +1,15 @@
+export interface MarkdownInputSettingsI {
+  src: string;
+  isRaw: boolean;
+  outputName: string; 
+  database: string;
+}
+
+export interface MarkdownContentResponseI {
+  content: string;
+  settings: MarkdownInputSettingsI;
+}
+
 /**
  * diagram definition, don't need renderer or styles
  */