Support typescript 4.8

timocov · Sep 8, 2022 · d1f34dc · d1f34dc
1 parent 6189c2a
commit d1f34dc
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/timocov/ts-transformer-minify-privates#readme",
   "peerDependencies": {
-    "typescript": ">=2.9.1"
+    "typescript": ">=4.8.2"
   },
   "devDependencies": {
     "@types/chai": "~4.1.7",
@@ -35,7 +35,7 @@
     "mocha": "~6.2.2",
     "ts-node": "~8.4.1",
     "tslint": "~5.20.0",
-    "typescript": "~3.6.4"
+    "typescript": "^4.8.2"
   },
   "scripts": {
     "tsc": "tsc -p .",

diff --git a/src/properties-minifier.ts b/src/properties-minifier.ts
@@ -154,7 +154,9 @@ function hasPrivateKeyword(node: ClassMember | ts.ParameterDeclaration): boolean
 }
 
 function hasModifier(node: ts.Node, modifier: ts.SyntaxKind): boolean {
-	return node.modifiers !== undefined && node.modifiers.some((mod: ts.Modifier) => mod.kind === modifier);
+	const modifiers = ts.canHaveModifiers(node) ? ts.getModifiers(node): undefined;
+
+	return modifiers !== undefined && modifiers.some((mod: ts.Modifier) => mod.kind === modifier);
 }
 
 type AccessExpression = ts.PropertyAccessExpression | ts.ElementAccessExpression;
@@ -196,5 +198,5 @@ function isPrivateNonStaticClassMember(symbol: ts.Symbol | undefined): boolean {
 }
 
 function hasDecorators(node: ts.Node): boolean {
-	return !!node.decorators;
+	return ts.canHaveDecorators(node) && !!ts.getDecorators(node);
 }
diff --git a/tests/test-cases/accessing-this-in-accessing-this/output.js b/tests/test-cases/accessing-this-in-accessing-this/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this._private_pimp = {};

diff --git a/tests/test-cases/accessing-to-other-instance/output.js b/tests/test-cases/accessing-to-other-instance/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this._private_field = Math.random();

diff --git a/tests/test-cases/accessing-via-prototype/output.js b/tests/test-cases/accessing-via-prototype/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this._private_privateField = 'string-value';

diff --git a/tests/test-cases/declaring-members-in-ctor-params/output.js b/tests/test-cases/declaring-members-in-ctor-params/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class(publicField, protectedField, _private_privateField) {
         this.publicField = publicField;

diff --git a/tests/test-cases/destructuring-this/output.js b/tests/test-cases/destructuring-this/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this._private_privateField = 'string-value';

diff --git a/tests/test-cases/indexed-access-in-this/output.js b/tests/test-cases/indexed-access-in-this/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var obj = {};
 var Class = /** @class */ (function () {
     function Class() {

diff --git a/tests/test-cases/numbered-props/output.js b/tests/test-cases/numbered-props/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this[356] = 3;

diff --git a/tests/test-cases/private-constructor/output.js b/tests/test-cases/private-constructor/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         console.log('hey');

diff --git a/tests/test-cases/private-method-as-props/output.js b/tests/test-cases/private-method-as-props/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this._private_methodAsProperty = function () {

diff --git a/tests/test-cases/private-static-fields/output.js b/tests/test-cases/private-static-fields/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this.publicField = 123;

diff --git a/tests/test-cases/private-with-decorators/output.js b/tests/test-cases/private-with-decorators/output.js
@@ -6,6 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this.publicField = 123;

diff --git a/tests/test-cases/reference-ctor-params/output.js b/tests/test-cases/reference-ctor-params/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class(_private_privateField) {
         this._private_privateField = _private_privateField;

diff --git a/tests/test-cases/simple/output.js b/tests/test-cases/simple/output.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Class = void 0;
 var Class = /** @class */ (function () {
     function Class() {
         this.publicField = 123;