Add formatError helper.

Author: mrix

index.ts

@@ -9,6 +9,7 @@ export * from "./src/Config";
 
 export * from "./src/Utils/Map";
 export * from "./src/Utils/uniqueArray";
+export * from "./src/Utils/formatError";
 
 export * from "./src/Schema/Definition";
 export * from "./src/Schema/Schema";

src/Utils/formatError.ts

@@ -0,0 +1,45 @@
+import * as ts from "typescript";
+import * as path from "path";
+
+import { BaseError } from "../Error/BaseError";
+import { DiagnosticError } from "../Error/DiagnosticError";
+import { UnknownNodeError } from "../Error/UnknownNodeError";
+
+function getSourceFile(node: ts.Node): ts.SourceFile {
+    let sourceFile: ts.Node = node.parent;
+    while (sourceFile) {
+        if (sourceFile.kind === ts.SyntaxKind.SourceFile) {
+            return sourceFile as ts.SourceFile;
+        }
+        sourceFile = sourceFile.parent;
+    }
+
+    return undefined;
+}
+
+function getNodeLocation(node: ts.Node): [string, number, number] {
+    const sourceFile: ts.SourceFile = getSourceFile(node);
+    if (!sourceFile) {
+        return ["<unknown file>", 0, 0];
+    }
+
+    const lineAndChar: ts.LineAndCharacter = ts.getLineAndCharacterOfPosition(sourceFile, node.getStart(sourceFile));
+    return [sourceFile.fileName, lineAndChar.line + 1, lineAndChar.character];
+}
+
+export function formatError(error: BaseError): string {
+    if (error instanceof DiagnosticError) {
+        const rootDir: string = process.cwd().split(path.sep)[0] || "/";
+        return ts.formatDiagnostics(error.getDiagnostics(), {
+            getCanonicalFileName: (fileName: string) => fileName,
+            getCurrentDirectory: () => rootDir,
+            getNewLine: () => "\n",
+        });
+    } else if (error instanceof UnknownNodeError) {
+        const firstLine: string = error.getNode().getFullText().trim().split("\n")[0].trim();
+        const [sourceFile, lineNumber, charPos]: [string, number, number] = getNodeLocation(error.getNode());
+        return `${error.name}: Unknown node type "${firstLine}" at ${sourceFile}(${lineNumber},${charPos})\n`;
+    }
+
+    return `${error.name}: ${error.message}\n`;
+}

typescript-to-json-schema.ts

@@ -1,12 +1,11 @@
-import * as ts from "typescript";
-import * as path from "path";
 import * as commander from "commander";
 
 import { createGenerator } from "./factory/generator";
+import { formatError } from "./src/Utils/formatError";
 
 import { Config } from "./src/Config";
 import { Schema } from "./src/Schema/Schema";
-import { DiagnosticError } from "./src/Error/DiagnosticError";
+import { BaseError } from "./src/Error/BaseError";
 
 const args: any = commander
     .option("-p, --path <path>", "Typescript path")
@@ -45,15 +44,10 @@ try {
     const schema: Schema = createGenerator(config).createSchema(args.type);
     process.stdout.write(JSON.stringify(schema, null, 2));
 } catch (error) {
-    if (error instanceof DiagnosticError) {
-        const errorMessage: string = ts.formatDiagnostics(error.getDiagnostics(), {
-            getCanonicalFileName: (fileName: string) => fileName,
-            getCurrentDirectory: () => path.resolve(path.dirname(args.path)),
-            getNewLine: () => "\n",
-        });
-        process.stderr.write(errorMessage);
+    if (error instanceof BaseError) {
+        process.stderr.write(formatError(error));
         process.exit(1);
+    } else {
+        throw error;
     }
-
-    throw error;
 }