Clarify testing prerequisites in readme and fix tests

.gitignore

@@ -14,4 +14,7 @@ npm-debug.log
 
 # Tests
 /tests/simple/js-generated
-/tests/compound/js-generated
+/tests/simple/ts-generated
+/tests/compound/js-generated
+/tests/compound/ts-generated
+/tests/compound/as3-tmp

README.md

@@ -33,6 +33,8 @@ Make sure you have [Node v6+](https://nodejs.org/) installed.
 
 You should have `as3-to-ts` now globaly available in your commandline.
 
+If you want to run the test suite using `npm test`, run `npm link @as3web/as3-to-ts` in the as3-to-ts folder. 
+
 ## Usage
 
 ```

src/emit/classlist.ts

@@ -50,9 +50,10 @@ export default class ClassList {
     }
 
     public static getLastPathToRoot():string{
-        if (ClassList.isScanning) return;
-        //let classRecord: ClassRecord = ClassList.classList[ClassList.classList.length - 1];
         let classRecord: ClassRecord = ClassList.currentClassRecord;
+        if(!classRecord) {
+            classRecord = ClassList.classList[ClassList.classList.length - 1];
+        }
 
         let packageLevel: number = 0;
         if (classRecord && classRecord.packageName && classRecord.packageName != "") {

src/emit/emitter.ts

@@ -977,7 +977,7 @@ function emitForEach(emitter:Emitter, node:Node):void {
 	emitter.catchup(blockNode.start + 1);
 
 	let def = emitter.findDefInScope(nameNode.text);
-	if (def.type && castStr == "" ){
+	if (def && def.type && castStr == "" ){
 		castStr = `<${def.type.toString()}>`;
 	}
 	let declarationWord:string = "";
@@ -1191,7 +1191,10 @@ function emitClass(emitter:Emitter, node:Node):void {
 	let mods = node.findChild(NodeKind.MOD_LIST);
 	if (mods && mods.children.length) {
 		emitter.catchup(mods.start);
-		emitter.insert("\n@classBound\n");
+
+		// insert @classBound with equal indentation for the next line
+		emitter.output = emitter.output.replace(/([^\S\n]*)$/, "$1@classBound\n$1"); 
+
 		let insertExport = false;
 		mods.children.forEach(node => {
 			if (node.text !== 'private') {
@@ -1441,16 +1444,20 @@ function emitMethod(emitter:Emitter, node:Node):void {
 	if (node.kind !== NodeKind.FUNCTION || name.text !== emitter.currentClassName) {
 		let pathToRoot = ClassList.getLastPathToRoot();
 		emitter.ensureImportIdentifier("bound", `${pathToRoot}bound`);
+
 		let mods = node.findChild(NodeKind.MOD_LIST);
-		if (mods)
+		if (mods) {
 			emitter.catchup(mods.start);
-		else
+		} else {
 			emitter.catchup(name.start);
-		emitter.insert("@bound\n");
+		}
+
+		// insert @bound with equal indentation for the next line
+		emitter.output = emitter.output.replace(/([^\S\n]*)$/, "$1@bound\n$1");
+
 		emitClassField(emitter, node);
-		emitter.consume('function', name.start);
+
 		emitter.catchup(name.end);
-		//emitter.insert(" = ");
 
 	} else {
 		let mods = node.findChild(NodeKind.MOD_LIST);

tests/compound/CompoundTests.js

@@ -96,7 +96,7 @@ filesAS.forEach(file => {
     }
   }
   else {
-    console.log(colors.red('  ✗ ERROR: unable to find reference file to compare to.'));
+    //console.log(colors.red('  ✗ ERROR: unable to find reference file to compare to.'));
   }
 });