Merge pull request #9 from timocov/fix-defining-properties

Author: timocov

src/exports-symbol-tree.ts

@@ -51,6 +51,21 @@ export class ExportsSymbolTree {
 	}
 
 	private computeTreeForChildren(targetSymbolsSet: Set<ts.Symbol>, node: ts.Node, visitedSymbols: Set<ts.Symbol>): void {
+		// it's similar to handling ts.Block node - both Block and variable's initializer are part of _implementation_
+		// and we don't care about that implementation at all - we just only need to worry it's definition
+		// for functions it is arguments and return type
+		// for variables - the type of a variable
+		if (ts.isVariableDeclaration(node)) {
+			const typeChecker = this.program.getTypeChecker();
+			const variableType = typeChecker.getTypeAtLocation(node);
+			const variableTypeSymbol = variableType.getSymbol();
+			if (variableTypeSymbol !== undefined) {
+				targetSymbolsSet.add(variableTypeSymbol);
+			}
+
+			return;
+		}
+
 		ts.forEachChild(node, (childNode: ts.Node) => this.computeTreeForNode(targetSymbolsSet, childNode, visitedSymbols));
 	}
 

src/typescript-helpers.ts

@@ -101,10 +101,14 @@ export function getExportsForSourceFile(typeChecker: ts.TypeChecker, sourceFileS
 	return result.map((symbol: ts.Symbol) => getActualSymbol(symbol, typeChecker));
 }
 
-export type ClassMember = ts.MethodDeclaration | ts.PropertyDeclaration;
+export type ClassMember =
+	| ts.MethodDeclaration
+	| ts.PropertyDeclaration
+	| ts.GetAccessorDeclaration
+	| ts.SetAccessorDeclaration;
 
 export function isClassMember(node: ts.Node): node is ClassMember {
-	return ts.isMethodDeclaration(node) || ts.isPropertyDeclaration(node);
+	return ts.isMethodDeclaration(node) || ts.isPropertyDeclaration(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node);
 }
 
 export function hasPrivateKeyword(node: ClassMember | ts.ParameterDeclaration): boolean {

tests/test-cases/class-properties/input.ts

@@ -0,0 +1,12 @@
+class TestProperties {
+	private _salad: number = 0;
+	public dressing: number = 0;
+	public get salad(): number { return this._salad; }
+	public set salad(val: number) { this._salad = val; }
+}
+
+const test1 = new TestProperties();
+test1.salad = 0;
+test1.dressing = 0;
+export const totalSalad = test1.salad + 1;
+export const totalDressing = test1.dressing + 0;

tests/test-cases/class-properties/output.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var TestProperties = /** @class */ (function () {
+    function TestProperties() {
+        this._private__salad = 0;
+        this._internal_dressing = 0;
+    }
+    Object.defineProperty(TestProperties.prototype, "_internal_salad", {
+        get: function () { return this._private__salad; },
+        set: function (val) { this._private__salad = val; },
+        enumerable: true,
+        configurable: true
+    });
+    return TestProperties;
+}());
+var test1 = new TestProperties();
+test1._internal_salad = 0;
+test1._internal_dressing = 0;
+exports.totalSalad = test1._internal_salad + 1;
+exports.totalDressing = test1._internal_dressing + 0;

tests/test-cases/export-variable-with-iife/input.ts

@@ -0,0 +1,15 @@
+class InternalClass {
+	public publicProperty: number = 1;
+}
+
+class InternalClass2 {
+	public publicProperty: number = 1;
+}
+
+export const exportedVariable = (() => {
+	return new InternalClass();
+})();
+
+export const exportedVariable2 = (() => {
+	return new InternalClass2().publicProperty;
+})();

tests/test-cases/export-variable-with-iife/output.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var InternalClass = /** @class */ (function () {
+    function InternalClass() {
+        this.publicProperty = 1;
+    }
+    return InternalClass;
+}());
+var InternalClass2 = /** @class */ (function () {
+    function InternalClass2() {
+        this._internal_publicProperty = 1;
+    }
+    return InternalClass2;
+}());
+exports.exportedVariable = (function () {
+    return new InternalClass();
+})();
+exports.exportedVariable2 = (function () {
+    return new InternalClass2()._internal_publicProperty;
+})();