non global error handling

johnfn · Dec 26, 2021 · a43f2d2 · a43f2d2
1 parent 4bb7384
commit a43f2d2
Show file tree

Hide file tree

Showing 17 changed files with 284 additions and 262 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,6 +13,15 @@
       "type": "pwa-node",
       "preLaunchTask": "tsc: build - tsconfig.json",
       "outFiles": ["${workspaceFolder}/js/**/*.js"]
+    },
+    {
+      "name": "Launch Test",
+      "program": "${workspaceFolder}/js/tests/test.js",
+      "request": "launch",
+      "skipFiles": ["<node_internals>/**"],
+      "type": "pwa-node",
+      "preLaunchTask": "tsc: build - tsconfig.json",
+      "outFiles": ["${workspaceFolder}/js/**/*.js"]
     }
   ]
 }
diff --git a/errors.ts b/errors.ts
diff --git a/parse_node.ts b/parse_node.ts
@@ -2,7 +2,7 @@ import * as utils from "tsutils"
 import ts, { SyntaxKind, tokenToString } from "typescript"
 
 import { AssetSourceFile } from "./project/assets/asset_source_file"
-import { ErrorName, TsGdError, addError } from "./errors"
+import TsGdProject, { ErrorName } from "./project"
 import { LibraryFunctionName } from "./parse_node/library_functions"
 import { Scope } from "./scope"
 import {
@@ -63,7 +63,6 @@ import { parseVariableDeclarationList } from "./parse_node/parse_variable_declar
 import { parseVariableStatement } from "./parse_node/parse_variable_statement"
 import { parseWhileStatement } from "./parse_node/parse_while_statement"
 import { parseYieldExpression } from "./parse_node/parse_yield_expression"
-import TsGdProject from "./project"
 
 export type ParseState = {
   isConstructor: boolean
@@ -483,7 +482,7 @@ export const parseNode = (
 
     default:
       console.error("Unknown token:", syntaxKindToString(genericNode.kind))
-      addError({
+      props.project.errors.add({
         error: ErrorName.UnknownTsSyntax,
         location: genericNode,
         stack: new Error().stack ?? "",

diff --git a/parse_node/parse_arrow_function.ts b/parse_node/parse_arrow_function.ts
@@ -1,6 +1,6 @@
 import ts, { SyntaxKind } from "typescript"
 
-import { ErrorName, addError } from "../errors"
+import { ErrorName } from "../project/errors"
 import { ParseNodeType, ParseState, combine } from "../parse_node"
 
 /**
@@ -38,7 +38,7 @@ const getFreeVariables = (
 
     if (symbol) {
       if (!symbol.declarations) {
-        addError({
+        props.project.errors.add({
           error: ErrorName.DeclarationNotGiven,
           location: node,
           stack: new Error().stack ?? "",
@@ -183,7 +183,7 @@ ${unwrapCapturedScope}
     .symbol?.declarations
 
   if (!decls) {
-    addError({
+    props.project.errors.add({
       error: ErrorName.DeclarationNotGiven,
       location: node,
       stack: new Error().stack ?? "",

diff --git a/parse_node/parse_call_expression.ts b/parse_node/parse_call_expression.ts
@@ -1,6 +1,6 @@
 import ts, { SyntaxKind } from "typescript"
 
-import { ErrorName, addError } from "../errors"
+import { ErrorName } from "../project/errors"
 import {
   ExtraLine,
   ExtraLineType,
@@ -202,7 +202,7 @@ export const parseCallExpression = (
             }
 
             if (!parsedArgs[0]) {
-              addError({
+              props.project.errors.add({
                 description:
                   "Missing arrow function argument in signal connect invocation.",
                 error: ErrorName.Ts2GdError,
@@ -217,7 +217,7 @@ export const parseCallExpression = (
                 )
 
               if (!arrowFunctionObj) {
-                addError({
+                props.project.errors.add({
                   description:
                     "ts2gd can't find that arrow function. This is an internal ts2gd error. Please report it on GitHub along with the code that caused it.",
                   error: ErrorName.Ts2GdError,
@@ -294,7 +294,7 @@ export const parseCallExpression = (
               content: expressionWithoutRpcName,
             }
           } else {
-            addError({
+            props.project.errors.add({
               description: "I'm confused by this rpc",
               error: ErrorName.Ts2GdError,
               location: pae.expression,

diff --git a/parse_node/parse_class_declaration.ts b/parse_node/parse_class_declaration.ts
@@ -1,6 +1,6 @@
 import ts, { SyntaxKind } from "typescript"
 
-import { ErrorName, addError } from "../errors"
+import { ErrorName } from "../project/errors"
 import { ParseNodeType, ParseState, combine } from "../parse_node"
 import { Test } from "../tests/test"
 import { getGodotType } from "../ts_utils"
@@ -91,7 +91,7 @@ export const parseClassDeclaration = (
   )
 
   if (!modifiers?.includes("export") && !isAutoload) {
-    addError({
+    props.project.errors.add({
       description: "You must export this class.",
       error: ErrorName.ClassMustBeExported,
       location: node,

diff --git a/parse_node/parse_import_declaration.ts b/parse_node/parse_import_declaration.ts
@@ -4,7 +4,7 @@ import { UsageDomain } from "tsutils"
 import ts, { SyntaxKind } from "typescript"
 
 import TsGdProject from "../project/project"
-import { ErrorName, addError } from "../errors"
+import { ErrorName } from "../project/errors"
 import { ParseNodeType, ParseState, combine } from "../parse_node"
 import { isEnumType } from "../ts_utils"
 
@@ -152,7 +152,7 @@ export const parseImportDeclaration = (
             continue
           }
 
-          addError({
+          props.project.errors.add({
             error: ErrorName.InvalidNumber,
             location: node,
             description: `Import ${pathToImportedTs} not found.`,

diff --git a/parse_node/parse_property_declaration.ts b/parse_node/parse_property_declaration.ts
@@ -1,7 +1,7 @@
 import chalk from "chalk"
 import ts, { SyntaxKind } from "typescript"
 
-import { ErrorName, addError } from "../errors"
+import { ErrorName } from "../project/errors"
 import { ParseNodeType, ParseState, combine } from "../parse_node"
 import { Test } from "../tests/test"
 import { getGodotType, getTypeHierarchy, isEnumType } from "../ts_utils"
@@ -127,7 +127,7 @@ const parseExportsArrayElement = (
     if (typeGodotElement) {
       godotExportArgs.push(typeGodotElement)
     } else {
-      addError({
+      props.project.errors.add({
         description: `
 Cannot infer element type for array export.
 `,
@@ -166,7 +166,7 @@ export const parseExportFlags = (
   )
 
   if (!decoration || decoration.expression.kind !== SyntaxKind.CallExpression) {
-    addError({
+    props.project.errors.add({
       description: `
 I'm confused by export_flags here. It should be a function call.
 
@@ -266,7 +266,7 @@ export const parsePropertyDeclaration = (
     if (signalName.startsWith("$")) {
       signalName = signalName.slice(1)
     } else {
-      addError({
+      props.project.errors.add({
         description: "Signals must be prefixed with $.",
         error: ErrorName.SignalsMustBePrefixedWith$,
         location: node,

diff --git a/parse_node/parse_source_file.ts b/parse_node/parse_source_file.ts
@@ -1,6 +1,6 @@
 import ts, { SyntaxKind } from "typescript"
 
-import { ErrorName, addError } from "../errors"
+import { ErrorName } from "../project/errors"
 import { ParseNodeType, ParseState, combine, parseNode } from "../parse_node"
 import { Test } from "../tests/test"
 
@@ -62,7 +62,7 @@ export const parseSourceFile = (
   ) as ts.ClassDeclaration[]
 
   if (allClasses.length === 0) {
-    addError({
+    props.project.errors.add({
       error: ErrorName.ClassNameNotFound,
       location: node,
       description:
@@ -111,7 +111,7 @@ export const parseSourceFile = (
       const className = classDecl.name?.text
 
       if (!className) {
-        addError({
+        props.project.errors.add({
           description: "Anonymous classes are not supported",
           error: ErrorName.ClassCannotBeAnonymous,
           location: classDecl,

diff --git a/project/assets/asset_godot_scene.ts b/project/assets/asset_godot_scene.ts
@@ -2,7 +2,7 @@ import path from "path"
 
 import chalk from "chalk"
 
-import { ErrorName, addError } from "../../errors"
+import { ErrorName } from "../errors"
 import TsGdProject from "../project"
 import { parseGodotConfigFile } from "../godot_parser"
 
@@ -180,7 +180,7 @@ export class GodotNode {
     }
 
     if (this.isInstanceOverride()) {
-      addError({
+      this.project.errors.add({
         description: `Error: should never try to get the type of an instance override. This is a ts2gd internal bug. Please report it on GitHub.`,
         error: ErrorName.InvalidFile,
         location: this.name,
@@ -196,7 +196,7 @@ export class GodotNode {
       return instancedSceneType
     }
 
-    addError({
+    this.project.errors.add({
       description: `Error: Your Godot scene ${chalk.blue(
         this.scene.fsPath
       )} refers to ${chalk.red(
@@ -315,7 +315,7 @@ export class AssetGodotScene extends BaseAsset {
         .find((sf) => sf.resPath === rootScript.resPath)
 
       if (!rootSourceFile) {
-        addError({
+        this.project.errors.add({
           description: `Failed to find root source file for ${rootScript.fsPath}`,
           error: ErrorName.Ts2GdError,
           location: rootScript.fsPath,
@@ -328,7 +328,7 @@ export class AssetGodotScene extends BaseAsset {
       const className = rootSourceFile.exportedTsClassName()
 
       if (!className) {
-        addError({
+        this.project.errors.add({
           description: `Failed to find classname for ${rootScript.fsPath}`,
           error: ErrorName.Ts2GdError,
           location: rootScript.fsPath,