Fix __setFunctionName overriding custom static name property

Author: pranshugupta01

src/compiler/factory/emitHelpers.ts

@@ -1024,6 +1024,8 @@ const setFunctionNameHelper: UnscopedEmitHelper = {
     text: `
         var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
             if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+            var d = Object.getOwnPropertyDescriptor(f, "name");
+            if (d && d.writable !== false) return f;
             return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
         };`,
 };

tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).js

@@ -0,0 +1,157 @@
+//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-staticName.ts] ////
+
+//// [esDecorators-classDeclaration-staticName.ts]
+declare let dec: any;
+
+@dec class A {
+    static get name() { return 123; }
+}
+
+@dec class B {
+    static name() { return 456; }
+}
+
+var C = @dec class {
+    static get name() { return 789; }
+};
+
+@dec class D {}
+
+@dec class E {
+    static name = "custom";
+}
+
+
+//// [esDecorators-classDeclaration-staticName.js]
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    var d = Object.getOwnPropertyDescriptor(f, "name");
+    if (d && d.writable !== false) return f;
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};
+let A = (() => {
+    let _classDecorators = [dec];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var A = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            A = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        static get name() { return 123; }
+    };
+    return A = _classThis;
+})();
+let B = (() => {
+    let _classDecorators = [dec];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var B = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            B = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        static name() { return 456; }
+    };
+    return B = _classThis;
+})();
+var C = (() => {
+    let _classDecorators = [dec];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var class_1 = class {
+        static { _classThis = this; }
+        static { __setFunctionName(_classThis, "C"); }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            class_1 = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        static get name() { return 789; }
+    };
+    return class_1 = _classThis;
+})();
+let D = (() => {
+    let _classDecorators = [dec];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var D = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            D = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+    };
+    return D = _classThis;
+})();
+let E = (() => {
+    let _classDecorators = [dec];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var E = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            E = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        }
+        static name = "custom";
+        static {
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+    };
+    return E = _classThis;
+})();

tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).js.map

@@ -0,0 +1,45 @@
+//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-staticName.ts] ////
+
+//// [esDecorators-classDeclaration-staticName.ts]
+declare let dec: any;
+
+@dec class A {
+    static get name() { return 123; }
+}
+
+@dec class B {
+    static name() { return 456; }
+}
+
+var C = @dec class {
+    static get name() { return 789; }
+};
+
+@dec class D {}
+
+@dec class E {
+    static name = "custom";
+}
+
+
+//// [esDecorators-classDeclaration-staticName.js]
+@dec
+class A {
+    static get name() { return 123; }
+}
+@dec
+class B {
+    static name() { return 456; }
+}
+var C = 
+@dec
+class {
+    static get name() { return 789; }
+};
+@dec
+class D {
+}
+@dec
+class E {
+    static name = "custom";
+}

tests/baselines/reference/esDecorators-classDeclaration-sourceMap(target=es2015).sourcemap.txt

@@ -54,6 +54,8 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 };
 var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
     if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    var d = Object.getOwnPropertyDescriptor(f, "name");
+    if (d && d.writable !== false) return f;
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
 // https://github.com/microsoft/TypeScript/issues/58436