Merge pull request #1 from kmturley/feature/nested-directory

Feature/nested directory

Author: kmturley

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "printWidth": 120,
+  "singleQuote": true,
+  "semi": true
+}

index.ts

@@ -1,7 +1,7 @@
 import { mkdirSync, writeFileSync } from 'fs';
 import { globSync } from 'glob';
-import { dirname } from 'path';
-import { InputData, JSONSchemaInput, JSONSchemaSourceData, JSONSchemaStore, RendererOptions, SerializedRenderResult, quicktype } from 'quicktype-core';
+import { basename, dirname, extname } from 'path';
+import { InputData, JSONSchemaInput, JSONSchemaSourceData, JSONSchemaStore, MultiFileRenderResult, RendererOptions, SerializedRenderResult, quicktypeMultiFile } from 'quicktype-core';
 import { schemaForTypeScriptSources } from 'quicktype-typescript-input';
 
 interface Config {
@@ -12,19 +12,41 @@ interface Config {
 
 async function load(globPath: string, configs: Config[]) {
   const filePaths: string[] = globSync(globPath);
+  const filePathMap: any = createFilePathMap(filePaths);
+  const inputData: InputData = await createJSONSchema(filePaths);
   console.log(`📁 ${filePaths}`);
+  console.log(filePathMap);
+  for (let i = 0; i < configs.length; i++) {
+    const { lang, ext, rendererOptions } = configs[i];
+    const packagePath: string = typeof rendererOptions.package === 'string' ? rendererOptions.package.replace('.', '/') + '/' : '';
+    const results: MultiFileRenderResult = await quicktypeMultiFile({ inputData, rendererOptions, lang });
+    results.forEach((result: SerializedRenderResult, name: string) => {
+      const fileKey: string = name.replace(extname(name), '');
+      const filePath: string = filePathMap[fileKey] || fileKey;
+      createFile(`./dist/${lang}/${packagePath}${filePath}.${ext}`, result.lines.join('\n'));
+    });
+  }
+}
+
+function createFilePathMap(filePaths: string[]) {
+  const filePathMap: any = {};
+  filePaths.forEach((filePath) => {
+    const fileExt: string = extname(filePath);
+    const fileKey: string = basename(filePath, fileExt);
+    filePathMap[fileKey] = filePath.replace('src/', '').replace(fileExt, '');
+  });
+  return filePathMap;
+}
+
+async function createJSONSchema(filePaths: string[]) {
   const jsonSchema: JSONSchemaSourceData = schemaForTypeScriptSources(filePaths);
   // @ts-ignore
   const jsonStore: JSONSchemaStore = new JSONSchemaStore();
   const jsonInput: JSONSchemaInput = new JSONSchemaInput(jsonStore);
   await jsonInput.addSource({ name: '#/definitions/', schema: jsonSchema.schema });
   const inputData: InputData = new InputData();
   inputData.addInput(jsonInput);
-  for (let i = 0; i < configs.length; i++) {
-    const { lang, ext, rendererOptions } = configs[i];
-    const result: SerializedRenderResult = await quicktype({ inputData, rendererOptions, lang });
-    createFile(`./dist/${lang}/types.${ext}`, result.lines.join('\n'));
-  }
+  return inputData;
 }
 
 function createFile(filePath: string, fileContents: string) {
@@ -34,7 +56,7 @@ function createFile(filePath: string, fileContents: string) {
 }
 
 load('./src/**/*.ts', [
-  { lang: 'java', ext: 'java', rendererOptions: { "just-types": true } },
+  { lang: 'java', ext: 'java', rendererOptions: { "just-types": true, package: 'com.example' } },
   { lang: 'schema', ext: 'json', rendererOptions: { "just-types": true } },
   { lang: 'ts', ext: 'ts', rendererOptions: { "just-types": true } }
 ]);