move to project based tests

.eslintrc.js

@@ -5,7 +5,6 @@ module.exports = {
     "**/godot_src/**",
     "**/js/**",
     ".eslintrc.js",
-    "tsconfig.json",
   ],
   env: {
     es2021: true,

.vscode/launch.json

@@ -5,23 +5,33 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Launch Program",
+      "name": "Run Example",
       "program": "${workspaceFolder}/js/main.js",
       "request": "launch",
-      "skipFiles": ["<node_internals>/**"],
-      "args": ["${workspaceFolder}/example/ts2gd.json"],
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "args": [
+        "${workspaceFolder}/example/ts2gd.json"
+      ],
       "type": "pwa-node",
       "preLaunchTask": "tsc: build - tsconfig.json",
-      "outFiles": ["${workspaceFolder}/js/**/*.js"]
+      "outFiles": [
+        "${workspaceFolder}/js/**/*.js"
+      ]
     },
     {
-      "name": "Launch Test",
+      "name": "Run Tests",
       "program": "${workspaceFolder}/js/tests/test.js",
       "request": "launch",
-      "skipFiles": ["<node_internals>/**"],
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
       "type": "pwa-node",
       "preLaunchTask": "tsc: build - tsconfig.json",
-      "outFiles": ["${workspaceFolder}/js/**/*.js"]
+      "outFiles": [
+        "${workspaceFolder}/js/**/*.js"
+      ]
     }
   ]
-}
+}

example/Autoload.gd

@@ -0,0 +1,13 @@
+
+# This file has been autogenerated by ts2gd. DO NOT EDIT!
+
+
+extends Node2D
+class_name Autoload
+
+
+
+
+var _MyAutoload = Autoload.new()
+
+var hello: String = "hi"

example/Test.gd

@@ -0,0 +1,12 @@
+
+# This file has been autogenerated by ts2gd. DO NOT EDIT!
+
+
+
+class_name Test
+
+
+
+
+
+

example/Test.ts

@@ -0,0 +1,2 @@
+// this file will have dynamic content from our test infrastructure
+export class Test {}

example/autoload.ts

@@ -0,0 +1,8 @@
+// this file will have dynamic content from our test infrastructure
+
+@autoload
+class Autoload extends Node2D {
+  public hello = "hi"
+}
+
+export const MyAutoload = new Autoload()

example/project.godot

@@ -8,12 +8,30 @@
 
 config_version=4
 
+_global_script_classes=[ {
+"base": "Reference",
+"class": "Test",
+"language": "GDScript",
+"path": "res://Test.gd"
+} ]
+_global_script_class_icons={
+"Test": ""
+}
+
 [application]
 
 config/name="example"
-run/main_scene="res://Main.tscn"
+run/main_scene="res://main.tscn"
 config/icon="res://icon.png"
 
+[autoload]
+
+Autoload="*res://Autoload.gd"
+
+[global]
+
+autoload=false
+
 [physics]
 
 common/enable_pause_aware_picking=true

example/ts2gd.json

@@ -2,5 +2,8 @@
   "destination": "./",
   "source": "./",
   "godotSourceRepoPath": "./godot_src",
-  "ignore": ["**/ignore_me/**", "ignore_me.ts"]
-}
+  "ignore": [
+    "**/ignore_me/**",
+    "ignore_me.ts"
+  ]
+}

main.ts

@@ -240,7 +240,7 @@ const setup = (tsgdJson: Paths) => {
   opt.config.useCaseSensitiveFileNames = false
 
   return {
-    watchProgram,
+    program: watchProgram.getProgram().getProgram(),
     tsgdJson,
     reportWatchStatusChanged,
     tsInitializationFinished,
@@ -266,10 +266,10 @@ export const main = async (args: ParsedArgs) => {
   const tsgdJson = new Paths(args)
 
   showLoadingMessage("Initializing TypeScript", args)
-  const { watchProgram, tsInitializationFinished } = setup(tsgdJson)
+  const { program, tsInitializationFinished } = setup(tsgdJson)
 
   showLoadingMessage("Scanning project", args)
-  let project = await makeTsGdProject(tsgdJson, watchProgram, args)
+  let project = await makeTsGdProject(tsgdJson, program, args)
 
   if (args.buildLibraries || project.shouldBuildLibraryDefinitions(args)) {
     showLoadingMessage("Building definition files", args)

package.json

@@ -33,18 +33,23 @@
     "semi": false
   },
   "lint-staged": {
-    "*.{ts,json}": [
+    "*.ts": [
       "eslint --fix",
       "prettier --write"
+    ],
+    "*.json": [
+      "prettier --write"
     ]
   },
   "dependencies": {
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
+    "lodash": "^4.17.21",
     "tsutils": "^3.21.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
+    "@types/lodash": "^4.14.178",
     "@types/node": "^16.11.9",
     "@types/xml2js": "^0.4.9",
     "@typescript-eslint/eslint-plugin": "^5.7.0",

parse_node/parse_enum_declaration.ts

@@ -2,6 +2,7 @@ import ts from "typescript"
 
 import { ParseNodeType, ParseState, combine } from "../parse_node"
 import { Test } from "../tests/test"
+import { examplePath } from "../tests/test_utils"
 
 import { getImportResPathForEnum } from "./parse_import_declaration"
 
@@ -71,17 +72,17 @@ export class Hello {
     type: "multiple-files",
     files: [
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Hello.gd",
+        fileName: examplePath("Hello.gd"),
         expected: `
 class_name Hello
-const MyEnum = preload("res://compiled/Test_MyEnum.gd").MyEnum
+const MyEnum = preload("res://Test_MyEnum.gd").MyEnum
 func _ready():
   print(MyEnum.A)
       `,
       },
 
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Test_MyEnum.gd",
+        fileName: examplePath("Test_MyEnum.gd"),
         expected: `
 const MyEnum = {
   "A": 0,
@@ -109,17 +110,17 @@ export class Hello {
     type: "multiple-files",
     files: [
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Hello.gd",
+        fileName: examplePath("Hello.gd"),
         expected: `
 class_name Hello
-const TestEnum = preload("res://compiled/Test_TestEnum.gd").TestEnum
+const TestEnum = preload("res://Test_TestEnum.gd").TestEnum
 func _ready():
   print(TestEnum.A)
       `,
       },
 
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Test_TestEnum.gd",
+        fileName: examplePath("Test_TestEnum.gd"),
         expected: `
 const TestEnum = {
   "A": "A",

parse_node/parse_property_declaration.ts

@@ -5,6 +5,7 @@ import { ErrorName } from "../project/errors"
 import { ParseNodeType, ParseState, combine } from "../parse_node"
 import { Test } from "../tests/test"
 import { getGodotType, getTypeHierarchy, isEnumType } from "../ts_utils"
+import { examplePath } from "../tests/test_utils"
 
 export const isDecoratedAsExports = (
   node:
@@ -448,16 +449,16 @@ export class Test {
     type: "multiple-files",
     files: [
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Test.gd",
+        fileName: examplePath("Test.gd"),
         expected: `
 class_name Test
-const MyEnum = preload("res://compiled/Test_MyEnum.gd").MyEnum
+const MyEnum = preload("res://Test_MyEnum.gd").MyEnum
 export(MyEnum) var foo
       `,
       },
 
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Test_MyEnum.gd",
+        fileName: examplePath("Test_MyEnum.gd"),
         expected: `
 const MyEnum = {
 }`,

parse_node/parse_source_file.ts

@@ -1,8 +1,9 @@
 import ts, { SyntaxKind } from "typescript"
 
-import { ErrorName } from "../project/errors"
+import { ErrorName } from "../project"
 import { ParseNodeType, ParseState, combine, parseNode } from "../parse_node"
 import { Test } from "../tests/test"
+import { examplePath } from "../tests/test_utils"
 
 import { LibraryFunctions } from "./library_functions"
 
@@ -221,11 +222,11 @@ export class Test2 { }
     type: "multiple-files",
     files: [
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Test1.gd",
+        fileName: examplePath("Test1.gd"),
         expected: `class_name Test1`,
       },
       {
-        fileName: "/Users/johnfn/MyGame/compiled/Test2.gd",
+        fileName: examplePath("Test2.gd"),
         expected: `class_name Test2`,
       },
     ],