fix: catch ts-json-schema error and pretty print

Jnig · Feb 18, 2022 · 5bdc310 · 5bdc310
1 parent 85eabaf
commit 5bdc310
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/packages/cli/src/helper/generateSchema.ts b/packages/cli/src/helper/generateSchema.ts
@@ -1,5 +1,6 @@
 import $RefParser from '@apidevtools/json-schema-ref-parser';
 import * as ts from 'ts-json-schema-generator';
+import { log } from '../log.js';
 interface GenerateSchemaOptions {
   removeDateTime: boolean;
 }
@@ -40,6 +41,19 @@ export class GenerateGlobalSchema {
         return '';
       }
 
+      if (e.diagnostics) {
+        e.diagnostics.forEach(
+          (element: { messageText: string; file: { fileName: string } }) => {
+            log({
+              component: 'cli',
+              warning: element.messageText,
+              details: element.file.fileName,
+            });
+          },
+        );
+        return '';
+      }
+
       throw e;
     }
   }

diff --git a/packages/cli/src/helper/index.ts b/packages/cli/src/helper/index.ts
@@ -14,7 +14,10 @@ export async function writeControllerJson() {
 
 export async function writeSchemaJson() {
   const config = await getConfig();
-  const schema = await generateSchema(config.entry, { removeDateTime: false });
+  let schema = await generateSchema(config.entry, { removeDateTime: false });
+  if (!schema) {
+    schema = '{}';
+  }
 
   writeFile(join(config.outdir, 'flux-schema.json'), schema);
 }