From 54759e6163255f1442442a68717b53973d7b52f1 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 21:11:59 +0000
Subject: [PATCH 01/16] feat: add required boolean field to Argument

---
 python-argparse-generator/src/__tests__/index.test.ts | 11 +++++++++--
 python-argparse-generator/src/index.ts                |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index 110e205..48bb61a 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -3,8 +3,15 @@ import { GenerateCode } from '../index';
 test('Basic check of output', () => {
   expect(
     GenerateCode([
-      { name: 'folder', type: 'str', variableName: 'folder', default: '"/data"', defaultDisplay: '"/data"' },
-      { name: 'limit', type: 'int', variableName: 'limit', default: '10', defaultDisplay: '10' },
+      {
+        name: 'folder',
+        type: 'str',
+        variableName: 'folder',
+        default: '"/data"',
+        defaultDisplay: '"/data"',
+        required: true,
+      },
+      { name: 'limit', type: 'int', variableName: 'limit', default: '10', defaultDisplay: '10', required: true },
     ]),
   ).toBe(`import argparse
 from typing import Dict, Any
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index a52f7df..56fd1b8 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -4,6 +4,7 @@ export type Argument = {
   variableName: string;
   default: string;
   defaultDisplay: string;
+  required: boolean;
 };
 
 function argumentToText(argument: Argument) {

From 83ee9ff3e1110ea51116a161106137f080ef44af Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 21:19:33 +0000
Subject: [PATCH 02/16] refactor: remove defaultDisplay from Argument

---
 .../src/__tests__/index.test.ts                      |  9 ++++++---
 python-argparse-generator/src/index.ts               | 12 +++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index 48bb61a..53e1154 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -7,11 +7,14 @@ test('Basic check of output', () => {
         name: 'folder',
         type: 'str',
         variableName: 'folder',
-        default: '"/data"',
-        defaultDisplay: '"/data"',
+        default: '/data',
         required: true,
       },
-      { name: 'limit', type: 'int', variableName: 'limit', default: '10', defaultDisplay: '10', required: true },
+      { name: 'limit',
+        type: 'int',
+        variableName: 'limit',
+        default: '10',
+        required: true },
     ]),
   ).toBe(`import argparse
 from typing import Dict, Any
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 56fd1b8..2bf5a8f 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -3,7 +3,6 @@ export type Argument = {
   type: string;
   variableName: string;
   default: string;
-  defaultDisplay: string;
   required: boolean;
 };
 
@@ -11,12 +10,19 @@ function argumentToText(argument: Argument) {
   switch (argument.type) {
     case 'bool':
       return `parser.add_argument("${argument.name}", action="store_${argument.default}")`;
-      break;
     default:
+      let defaultDisplay;
+
+      if (argument.type === 'str') {
+        defaultDisplay = `"${argument.default}"`;
+      } else {
+        defaultDisplay = argument.default;
+      }
+
       if (argument.default === undefined) {
         return `parser.add_argument("${argument.name}", type=${argument.type})`;
       } else {
-        return `parser.add_argument("${argument.name}", type=${argument.type}, default=${argument.defaultDisplay})`;
+        return `parser.add_argument("${argument.name}", type=${argument.type}, default=${defaultDisplay})`;
       }
   }
 }

From cee7ada3edc5fea79af8fc6be0e37f51723036a3 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 21:21:49 +0000
Subject: [PATCH 03/16] refactor: GenerateCode -> argparseCode

---
 README.md                                             | 6 +++---
 python-argparse-generator/src/__tests__/index.test.ts | 4 ++--
 python-argparse-generator/src/index.ts                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2dbeae4..5284f89 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Within HTML:
     <script src="https://unpkg.com/python-argparse-generator/lib/index.js"></script>
 </head>
 <script>
-    const pythonCode = GenerateCode([
+    const pythonCode = argparseCode([
         { name: 'folder', type: 'str', variableName: 'folder', default: '"/data"', defaultDisplay: '"/data"' },
         { name: 'limit', type: 'int', variableName: 'limit', default: '10', defaultDisplay: '10' },
     ]);
@@ -40,14 +40,14 @@ Within HTML:
 Within Typescript:
 
 ```ts
-import { Argument, GenerateCode } from 'python-argparse-generator';
+import { Argument, argparseCode } from 'python-argparse-generator';
 
 const args: Argument[] = [
     { name: 'folder', type: 'str', variableName: 'folder', default: '"/data"', defaultDisplay: '"/data"' },
     { name: 'limit', type: 'int', variableName: 'limit', default: '10', defaultDisplay: '10' },
 ];
 
-const pythonCode = GenerateCode(args);
+const pythonCode = argparseCode(args);
 ```
 
 Where content of `pythonCode` string is:
diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index 53e1154..4feef99 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -1,8 +1,8 @@
-import { GenerateCode } from '../index';
+import { argparseCode } from '../index';
 
 test('Basic check of output', () => {
   expect(
-    GenerateCode([
+    argparseCode([
       {
         name: 'folder',
         type: 'str',
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 2bf5a8f..b4c2e23 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -29,7 +29,7 @@ function argumentToText(argument: Argument) {
 
 const argumentToMainParams = (argument: Argument) => `${argument.variableName}: ${argument.type}`;
 
-export const GenerateCode = (args: Argument[]) => {
+export const argparseCode = (args: Argument[]) => {
   const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));
   const argumentsText: string[] = args.map((arg) => argumentToText(arg));
   const returnText: string[] = args.map((x) => {

From f8627661cfacd3e44eafda17d7b3fb2bab57d51a Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 21:30:54 +0000
Subject: [PATCH 04/16] feat: parserName argument

---
 .../src/__tests__/index.test.ts               | 27 +++++++++----------
 python-argparse-generator/src/index.ts        | 16 +++++------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index 4feef99..85a4bb8 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -2,20 +2,19 @@ import { argparseCode } from '../index';
 
 test('Basic check of output', () => {
   expect(
-    argparseCode([
-      {
-        name: 'folder',
-        type: 'str',
-        variableName: 'folder',
-        default: '/data',
-        required: true,
-      },
-      { name: 'limit',
-        type: 'int',
-        variableName: 'limit',
-        default: '10',
-        required: true },
-    ]),
+    argparseCode(
+      [
+        {
+          name: 'folder',
+          type: 'str',
+          variableName: 'folder',
+          default: '/data',
+          required: true,
+        },
+        { name: 'limit', type: 'int', variableName: 'limit', default: '10', required: true },
+      ],
+      'parser',
+    ),
   ).toBe(`import argparse
 from typing import Dict, Any
   
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index b4c2e23..b976303 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -6,10 +6,10 @@ export type Argument = {
   required: boolean;
 };
 
-function argumentToText(argument: Argument) {
+function argumentToText(argument: Argument, parserName: string) {
   switch (argument.type) {
     case 'bool':
-      return `parser.add_argument("${argument.name}", action="store_${argument.default}")`;
+      return `${parserName}.add_argument("${argument.name}", action="store_${argument.default}")`;
     default:
       let defaultDisplay;
 
@@ -20,18 +20,18 @@ function argumentToText(argument: Argument) {
       }
 
       if (argument.default === undefined) {
-        return `parser.add_argument("${argument.name}", type=${argument.type})`;
+        return `${parserName}.add_argument("${argument.name}", type=${argument.type})`;
       } else {
-        return `parser.add_argument("${argument.name}", type=${argument.type}, default=${defaultDisplay})`;
+        return `${parserName}.add_argument("${argument.name}", type=${argument.type}, default=${defaultDisplay})`;
       }
   }
 }
 
 const argumentToMainParams = (argument: Argument) => `${argument.variableName}: ${argument.type}`;
 
-export const argparseCode = (args: Argument[]) => {
+export const argparseCode = (args: Argument[], parserName: string) => {
   const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));
-  const argumentsText: string[] = args.map((arg) => argumentToText(arg));
+  const argumentsText: string[] = args.map((arg) => argumentToText(arg, parserName));
   const returnText: string[] = args.map((x) => {
     if (x.type === 'str') {
       return `"${x.variableName}": args.${x.variableName},`;
@@ -50,11 +50,11 @@ def main(${mainParameters.join(', ')}) -> None:
 
 def cli() -> Dict[str, Any]:
     formatter_class = argparse.ArgumentDefaultsHelpFormatter
-    parser = argparse.ArgumentParser(formatter_class=formatter_class)
+    ${parserName} = argparse.ArgumentParser(formatter_class=formatter_class)
 
     ${argumentsText.join('\n    ')}
 
-    args = parser.parse_args()
+    args = ${parserName}.parse_args()
 
     return {${returnText.join('\n            ').slice(0, -1)}}
 

From 00ff970bac1117517cf9dbdc1ed3623cbffe18f9 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 21:32:39 +0000
Subject: [PATCH 05/16] feat: parserName default

---
 python-argparse-generator/src/__tests__/index.test.ts | 1 -
 python-argparse-generator/src/index.ts                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index 85a4bb8..ebbe8ba 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -13,7 +13,6 @@ test('Basic check of output', () => {
         },
         { name: 'limit', type: 'int', variableName: 'limit', default: '10', required: true },
       ],
-      'parser',
     ),
   ).toBe(`import argparse
 from typing import Dict, Any
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index b976303..adb181d 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -29,7 +29,7 @@ function argumentToText(argument: Argument, parserName: string) {
 
 const argumentToMainParams = (argument: Argument) => `${argument.variableName}: ${argument.type}`;
 
-export const argparseCode = (args: Argument[], parserName: string) => {
+export const argparseCode = (args: Argument[], parserName: string = "parser") => {
   const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));
   const argumentsText: string[] = args.map((arg) => argumentToText(arg, parserName));
   const returnText: string[] = args.map((x) => {

From e4de6998c0736dbf74fb8c5a8689f1befe003886 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 21:36:33 +0000
Subject: [PATCH 06/16] feat: format main call vertically

---
 python-argparse-generator/src/__tests__/index.test.ts | 3 ++-
 python-argparse-generator/src/index.ts                | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index ebbe8ba..771c4b7 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -36,6 +36,7 @@ def cli() -> Dict[str, Any]:
 
 if __name__ == '__main__':
     args = cli()
-    main(folder=args["folder"], limit=args["limit"])
+    main(folder=args["folder"],
+         limit=args["limit"])
 `);
 });
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index adb181d..a6f8bdc 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -60,7 +60,7 @@ def cli() -> Dict[str, Any]:
 
 if __name__ == '__main__':
     args = cli()
-    main(${args.map((x) => `${x.variableName}=args["${x.variableName}"]`).join(', ')})
+    main(${args.map((x) => `${x.variableName}=args["${x.variableName}"]`).join(',\n         ')})
 `;
   return output;
 };

From ff8fece64a2f77eae30a1312842c532646bd0c55 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 22:17:20 +0000
Subject: [PATCH 07/16] feat: newArgument

---
 .../src/__tests__/index.test.ts               | 55 ++++++++++++++-----
 python-argparse-generator/src/index.ts        | 15 ++++-
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index 771c4b7..ae72c65 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -1,19 +1,17 @@
-import { argparseCode } from '../index';
+import { argparseCode, newArgument } from '../index';
 
 test('Basic check of output', () => {
   expect(
-    argparseCode(
-      [
-        {
-          name: 'folder',
-          type: 'str',
-          variableName: 'folder',
-          default: '/data',
-          required: true,
-        },
-        { name: 'limit', type: 'int', variableName: 'limit', default: '10', required: true },
-      ],
-    ),
+    argparseCode([
+      {
+        name: 'folder',
+        type: 'str',
+        variableName: 'folder',
+        default: '/data',
+        required: true,
+      },
+      { name: 'limit', type: 'int', variableName: 'limit', default: '10', required: true },
+    ]),
   ).toBe(`import argparse
 from typing import Dict, Any
   
@@ -40,3 +38,34 @@ if __name__ == '__main__':
          limit=args["limit"])
 `);
 });
+
+describe('New Argument Factory', () => {
+  test('Default Parameters', () => {
+    expect(newArgument('folder', 'str')).toStrictEqual({
+      name: 'folder',
+      type: 'str',
+      default: '',
+      variableName: 'folder',
+      required: false,
+    });
+  });
+  // TODO really I should have a variableNameCreate function
+  test('Variable Name Creation', () => {
+    expect(newArgument('time-delay', 'str')).toStrictEqual({
+      name: 'time-delay',
+      type: 'str',
+      default: '',
+      variableName: 'timedelay',
+      required: false,
+    });
+  });
+  test('All Params', () => {
+    expect(newArgument('folder', 'str', 'folder', '/data', true)).toStrictEqual({
+      name: 'folder',
+      type: 'str',
+      default: '/data',
+      variableName: 'folder',
+      required: true,
+    });
+  });
+});
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index a6f8bdc..42d55e6 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -6,6 +6,19 @@ export type Argument = {
   required: boolean;
 };
 
+export const newArgument = (
+  name: string,
+  type: string,
+  variableName: string = '',
+  defaultValue: string = '',
+  required: boolean = false,
+): Argument => {
+  if (variableName === '') {
+    variableName = name.replace(/-/g, '');
+  }
+  return { name, type, variableName, default: defaultValue, required };
+};
+
 function argumentToText(argument: Argument, parserName: string) {
   switch (argument.type) {
     case 'bool':
@@ -29,7 +42,7 @@ function argumentToText(argument: Argument, parserName: string) {
 
 const argumentToMainParams = (argument: Argument) => `${argument.variableName}: ${argument.type}`;
 
-export const argparseCode = (args: Argument[], parserName: string = "parser") => {
+export const argparseCode = (args: Argument[], parserName: string = 'parser') => {
   const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));
   const argumentsText: string[] = args.map((arg) => argumentToText(arg, parserName));
   const returnText: string[] = args.map((x) => {

From 66dc3d4927cfd737a312577acbce2c70ace81967 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 22:23:10 +0000
Subject: [PATCH 08/16] feat: Settings type

---
 python-argparse-generator/src/index.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 42d55e6..2219f48 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -1,3 +1,11 @@
+export type Settings = {
+  parserName: string;
+}
+
+export const defaultSettings = (): Settings => {
+  return {parserName: "parser"};
+};
+
 export type Argument = {
   name: string;
   type: string;
@@ -42,7 +50,8 @@ function argumentToText(argument: Argument, parserName: string) {
 
 const argumentToMainParams = (argument: Argument) => `${argument.variableName}: ${argument.type}`;
 
-export const argparseCode = (args: Argument[], parserName: string = 'parser') => {
+export const argparseCode = (args: Argument[], settings: Settings =  defaultSettings()) => {
+  const parserName: string = settings.parserName;
   const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));
   const argumentsText: string[] = args.map((arg) => argumentToText(arg, parserName));
   const returnText: string[] = args.map((x) => {

From f1d9bd548cd71faf22f2444e524565e4784a211b Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 22:27:22 +0000
Subject: [PATCH 09/16] feat: mainContents

---
 python-argparse-generator/src/index.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 2219f48..23fb36c 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -1,9 +1,13 @@
 export type Settings = {
   parserName: string;
+  typeHints: boolean;
+  mainContents: string;
 }
 
 export const defaultSettings = (): Settings => {
-  return {parserName: "parser"};
+  return {parserName: "parser",
+          typeHints: true,
+          mainContents: "# Contents of main"};
 };
 
 export type Argument = {
@@ -66,7 +70,7 @@ export const argparseCode = (args: Argument[], settings: Settings =  defaultSett
 from typing import Dict, Any
   
 def main(${mainParameters.join(', ')}) -> None:
-    # Contents of main
+    ${settings.mainContents}
     return
 
 

From 26c1931dc801ed6261bec093302b07367416fa1b Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 22:28:41 +0000
Subject: [PATCH 10/16] feat: mainName

---
 python-argparse-generator/src/index.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 23fb36c..21c9448 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -2,12 +2,14 @@ export type Settings = {
   parserName: string;
   typeHints: boolean;
   mainContents: string;
+  mainName: string;
 }
 
 export const defaultSettings = (): Settings => {
   return {parserName: "parser",
           typeHints: true,
-          mainContents: "# Contents of main"};
+          mainContents: "# Contents of main",
+          mainName: "main"};
 };
 
 export type Argument = {
@@ -69,7 +71,7 @@ export const argparseCode = (args: Argument[], settings: Settings =  defaultSett
   const output = `import argparse
 from typing import Dict, Any
   
-def main(${mainParameters.join(', ')}) -> None:
+def ${settings.mainName}(${mainParameters.join(', ')}) -> None:
     ${settings.mainContents}
     return
 
@@ -86,7 +88,7 @@ def cli() -> Dict[str, Any]:
 
 if __name__ == '__main__':
     args = cli()
-    main(${args.map((x) => `${x.variableName}=args["${x.variableName}"]`).join(',\n         ')})
+    ${settings.mainName}(${args.map((x) => `${x.variableName}=args["${x.variableName}"]`).join(',\n         ')})
 `;
   return output;
 };

From 1f7436268749670854f516000f271030c74dcfd1 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Mon, 14 Feb 2022 22:30:14 +0000
Subject: [PATCH 11/16] feat: cliName

---
 python-argparse-generator/src/index.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 21c9448..3ebf5eb 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -3,13 +3,15 @@ export type Settings = {
   typeHints: boolean;
   mainContents: string;
   mainName: string;
+  cliName: string;
 }
 
 export const defaultSettings = (): Settings => {
   return {parserName: "parser",
           typeHints: true,
           mainContents: "# Contents of main",
-          mainName: "main"};
+          mainName: "main",
+          cliName: "cli"};
 };
 
 export type Argument = {
@@ -76,7 +78,7 @@ def ${settings.mainName}(${mainParameters.join(', ')}) -> None:
     return
 
 
-def cli() -> Dict[str, Any]:
+def ${settings.cliName}() -> Dict[str, Any]:
     formatter_class = argparse.ArgumentDefaultsHelpFormatter
     ${parserName} = argparse.ArgumentParser(formatter_class=formatter_class)
 
@@ -87,7 +89,7 @@ def cli() -> Dict[str, Any]:
     return {${returnText.join('\n            ').slice(0, -1)}}
 
 if __name__ == '__main__':
-    args = cli()
+    args = ${settings.cliName}()
     ${settings.mainName}(${args.map((x) => `${x.variableName}=args["${x.variableName}"]`).join(',\n         ')})
 `;
   return output;

From 8e4ea1c79b7073e0518af24a2a9b043275163bb7 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Tue, 15 Feb 2022 17:42:32 +0000
Subject: [PATCH 12/16] feat: argsName to settings

---
 python-argparse-generator/src/index.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 3ebf5eb..bfc44bc 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -4,6 +4,7 @@ export type Settings = {
   mainContents: string;
   mainName: string;
   cliName: string;
+  argsName: string;
 }
 
 export const defaultSettings = (): Settings => {
@@ -11,7 +12,8 @@ export const defaultSettings = (): Settings => {
           typeHints: true,
           mainContents: "# Contents of main",
           mainName: "main",
-          cliName: "cli"};
+          cliName: "cli",
+          argsName: "args"};
 };
 
 export type Argument = {
@@ -60,13 +62,14 @@ const argumentToMainParams = (argument: Argument) => `${argument.variableName}:
 
 export const argparseCode = (args: Argument[], settings: Settings =  defaultSettings()) => {
   const parserName: string = settings.parserName;
+  const argsName: string = settings.argsName;
   const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));
   const argumentsText: string[] = args.map((arg) => argumentToText(arg, parserName));
   const returnText: string[] = args.map((x) => {
     if (x.type === 'str') {
-      return `"${x.variableName}": args.${x.variableName},`;
+      return `"${x.variableName}": ${argsName}.${x.variableName},`;
     } else {
-      return `"${x.variableName}": ${x.type}(args.${x.variableName}),`;
+      return `"${x.variableName}": ${x.type}(${argsName}.${x.variableName}),`;
     }
   });
 
@@ -84,13 +87,13 @@ def ${settings.cliName}() -> Dict[str, Any]:
 
     ${argumentsText.join('\n    ')}
 
-    args = ${parserName}.parse_args()
+    ${argsName} = ${parserName}.parse_args()
 
     return {${returnText.join('\n            ').slice(0, -1)}}
 
 if __name__ == '__main__':
-    args = ${settings.cliName}()
-    ${settings.mainName}(${args.map((x) => `${x.variableName}=args["${x.variableName}"]`).join(',\n         ')})
+    ${argsName} = ${settings.cliName}()
+    ${settings.mainName}(${args.map((x) => `${x.variableName}=${argsName}["${x.variableName}"]`).join(',\n         ')})
 `;
   return output;
 };

From 4da0dcbf2db3d9eefcbb6dd6239f793c2024c816 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Tue, 15 Feb 2022 17:44:40 +0000
Subject: [PATCH 13/16] feat: add newlines

---
 python-argparse-generator/src/__tests__/index.test.ts | 4 +++-
 python-argparse-generator/src/index.ts                | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index ae72c65..a930336 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -14,7 +14,8 @@ test('Basic check of output', () => {
     ]),
   ).toBe(`import argparse
 from typing import Dict, Any
-  
+
+
 def main(folder: str, limit: int) -> None:
     # Contents of main
     return
@@ -32,6 +33,7 @@ def cli() -> Dict[str, Any]:
     return {"folder": args.folder,
             "limit": int(args.limit)}
 
+
 if __name__ == '__main__':
     args = cli()
     main(folder=args["folder"],
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index bfc44bc..2cc3ae2 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -75,7 +75,8 @@ export const argparseCode = (args: Argument[], settings: Settings =  defaultSett
 
   const output = `import argparse
 from typing import Dict, Any
-  
+
+
 def ${settings.mainName}(${mainParameters.join(', ')}) -> None:
     ${settings.mainContents}
     return
@@ -91,6 +92,7 @@ def ${settings.cliName}() -> Dict[str, Any]:
 
     return {${returnText.join('\n            ').slice(0, -1)}}
 
+
 if __name__ == '__main__':
     ${argsName} = ${settings.cliName}()
     ${settings.mainName}(${args.map((x) => `${x.variableName}=${argsName}["${x.variableName}"]`).join(',\n         ')})

From d531804c79b6ca4c19e2693bdb656e304833572c Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Tue, 15 Feb 2022 17:48:12 +0000
Subject: [PATCH 14/16] feat: formatting

---
 .../src/__tests__/index.test.ts               | 28 ++++++++++---------
 python-argparse-generator/src/index.ts        | 18 ++++++------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index a930336..1385628 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -1,18 +1,19 @@
 import { argparseCode, newArgument } from '../index';
 
-test('Basic check of output', () => {
-  expect(
-    argparseCode([
-      {
-        name: 'folder',
-        type: 'str',
-        variableName: 'folder',
-        default: '/data',
-        required: true,
-      },
-      { name: 'limit', type: 'int', variableName: 'limit', default: '10', required: true },
-    ]),
-  ).toBe(`import argparse
+describe('Check Of argparseCode Output', () => {
+  test('Basic check of output', () => {
+    expect(
+      argparseCode([
+        {
+          name: 'folder',
+          type: 'str',
+          variableName: 'folder',
+          default: '/data',
+          required: true,
+        },
+        { name: 'limit', type: 'int', variableName: 'limit', default: '10', required: true },
+      ]),
+    ).toBe(`import argparse
 from typing import Dict, Any
 
 
@@ -39,6 +40,7 @@ if __name__ == '__main__':
     main(folder=args["folder"],
          limit=args["limit"])
 `);
+  });
 });
 
 describe('New Argument Factory', () => {
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index 2cc3ae2..f9d1bb5 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -5,15 +5,17 @@ export type Settings = {
   mainName: string;
   cliName: string;
   argsName: string;
-}
+};
 
 export const defaultSettings = (): Settings => {
-  return {parserName: "parser",
-          typeHints: true,
-          mainContents: "# Contents of main",
-          mainName: "main",
-          cliName: "cli",
-          argsName: "args"};
+  return {
+    parserName: 'parser',
+    typeHints: true,
+    mainContents: '# Contents of main',
+    mainName: 'main',
+    cliName: 'cli',
+    argsName: 'args',
+  };
 };
 
 export type Argument = {
@@ -60,7 +62,7 @@ function argumentToText(argument: Argument, parserName: string) {
 
 const argumentToMainParams = (argument: Argument) => `${argument.variableName}: ${argument.type}`;
 
-export const argparseCode = (args: Argument[], settings: Settings =  defaultSettings()) => {
+export const argparseCode = (args: Argument[], settings: Settings = defaultSettings()) => {
   const parserName: string = settings.parserName;
   const argsName: string = settings.argsName;
   const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));

From ff2062dc25e2a9831f8f0e8fe26d9d3721cb02cb Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Tue, 15 Feb 2022 18:05:56 +0000
Subject: [PATCH 15/16] feat: toggle type hints

---
 .../src/__tests__/index.test.ts               | 42 ++++++++++++++++++-
 python-argparse-generator/src/index.ts        | 21 +++++++---
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/python-argparse-generator/src/__tests__/index.test.ts b/python-argparse-generator/src/__tests__/index.test.ts
index 1385628..73b9521 100644
--- a/python-argparse-generator/src/__tests__/index.test.ts
+++ b/python-argparse-generator/src/__tests__/index.test.ts
@@ -1,6 +1,16 @@
-import { argparseCode, newArgument } from '../index';
+import { argparseCode, newArgument, defaultSettings } from '../index';
 
 describe('Check Of argparseCode Output', () => {
+  const args = [
+    {
+      name: 'folder',
+      type: 'str',
+      variableName: 'folder',
+      default: '/data',
+      required: true,
+    },
+    { name: 'limit', type: 'int', variableName: 'limit', default: '10', required: true },
+  ];
   test('Basic check of output', () => {
     expect(
       argparseCode([
@@ -35,6 +45,36 @@ def cli() -> Dict[str, Any]:
             "limit": int(args.limit)}
 
 
+if __name__ == '__main__':
+    args = cli()
+    main(folder=args["folder"],
+         limit=args["limit"])
+`);
+  });
+  test('Type Hints False', () => {
+    let settings = defaultSettings();
+    settings.typeHints = false;
+    expect(argparseCode(args, settings)).toBe(`import argparse
+
+
+def main(folder, limit):
+    # Contents of main
+    return
+
+
+def cli():
+    formatter_class = argparse.ArgumentDefaultsHelpFormatter
+    parser = argparse.ArgumentParser(formatter_class=formatter_class)
+
+    parser.add_argument("folder", type=str, default="/data")
+    parser.add_argument("limit", type=int, default=10)
+
+    args = parser.parse_args()
+
+    return {"folder": args.folder,
+            "limit": int(args.limit)}
+
+
 if __name__ == '__main__':
     args = cli()
     main(folder=args["folder"],
diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index f9d1bb5..d571bb5 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -60,12 +60,18 @@ function argumentToText(argument: Argument, parserName: string) {
   }
 }
 
-const argumentToMainParams = (argument: Argument) => `${argument.variableName}: ${argument.type}`;
+const argumentToMainParams = (argument: Argument, typeHints: boolean) => {
+  if (typeHints) {
+    return `${argument.variableName}: ${argument.type}`;
+  } else {
+    return `${argument.variableName}`;
+  }
+  };
 
 export const argparseCode = (args: Argument[], settings: Settings = defaultSettings()) => {
   const parserName: string = settings.parserName;
   const argsName: string = settings.argsName;
-  const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg));
+  const mainParameters: string[] = args.map((arg) => argumentToMainParams(arg, settings.typeHints));
   const argumentsText: string[] = args.map((arg) => argumentToText(arg, parserName));
   const returnText: string[] = args.map((x) => {
     if (x.type === 'str') {
@@ -75,16 +81,19 @@ export const argparseCode = (args: Argument[], settings: Settings = defaultSetti
     }
   });
 
-  const output = `import argparse
-from typing import Dict, Any
+  const mainReturnType = settings.typeHints ? ' -> None' : '';
+  const cliReturnType = settings.typeHints ? ' -> Dict[str, Any]' : '';
+  const typeImports = settings.typeHints ? '\nfrom typing import Dict, Any' : '';
+
+  const output = `import argparse${typeImports}
 
 
-def ${settings.mainName}(${mainParameters.join(', ')}) -> None:
+def ${settings.mainName}(${mainParameters.join(', ')})${mainReturnType}:
     ${settings.mainContents}
     return
 
 
-def ${settings.cliName}() -> Dict[str, Any]:
+def ${settings.cliName}()${cliReturnType}:
     formatter_class = argparse.ArgumentDefaultsHelpFormatter
     ${parserName} = argparse.ArgumentParser(formatter_class=formatter_class)
 

From 3c7d61d71c54fdca7567ae4a6cf6a813b351bc06 Mon Sep 17 00:00:00 2001
From: HaeckelK <haeckelk.github@gmail.com>
Date: Tue, 15 Feb 2022 18:06:44 +0000
Subject: [PATCH 16/16] style: formatting

---
 python-argparse-generator/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-argparse-generator/src/index.ts b/python-argparse-generator/src/index.ts
index d571bb5..67c7c52 100644
--- a/python-argparse-generator/src/index.ts
+++ b/python-argparse-generator/src/index.ts
@@ -66,7 +66,7 @@ const argumentToMainParams = (argument: Argument, typeHints: boolean) => {
   } else {
     return `${argument.variableName}`;
   }
-  };
+};
 
 export const argparseCode = (args: Argument[], settings: Settings = defaultSettings()) => {
   const parserName: string = settings.parserName;