Add test for class+namespace merging

Author: rbuckton

tests/baselines/reference/esDecorators-classDeclaration-commonjs-classNamespaceMerge.js

@@ -0,0 +1,71 @@
+//// [esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts]
+declare var deco: any;
+
+@deco
+export class Example {
+    static foo() {}
+}
+
+export namespace Example {
+    export const x = 1;
+}
+
+Example.foo();
+
+//// [esDecorators-classDeclaration-commonjs-classNamespaceMerge.js]
+"use strict";
+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.push(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.push(_);
+            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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Example = void 0;
+let Example = exports.Example = (() => {
+    let _classDecorators = [deco];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var Example = class {
+        static {
+            __esDecorate(null, _classDescriptor = { value: this }, _classDecorators, { kind: "class", name: this.name }, null, _classExtraInitializers);
+            Example = _classThis = _classDescriptor.value;
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        static foo() { }
+    };
+    return Example = _classThis;
+})();
+(function (Example) {
+    Example.x = 1;
+})(Example = exports.Example || (exports.Example = {}));
+Example.foo();

tests/baselines/reference/esDecorators-classDeclaration-commonjs-classNamespaceMerge.symbols

@@ -0,0 +1,26 @@
+=== tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts ===
+declare var deco: any;
+>deco : Symbol(deco, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 0, 11))
+
+@deco
+>deco : Symbol(deco, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 0, 11))
+
+export class Example {
+>Example : Symbol(Example, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 0, 22), Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 5, 1))
+
+    static foo() {}
+>foo : Symbol(Example.foo, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 3, 22))
+}
+
+export namespace Example {
+>Example : Symbol(Example, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 0, 22), Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 5, 1))
+
+    export const x = 1;
+>x : Symbol(x, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 8, 16))
+}
+
+Example.foo();
+>Example.foo : Symbol(Example.foo, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 3, 22))
+>Example : Symbol(Example, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 0, 22), Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 5, 1))
+>foo : Symbol(Example.foo, Decl(esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts, 3, 22))
+

tests/baselines/reference/esDecorators-classDeclaration-commonjs-classNamespaceMerge.types

@@ -0,0 +1,28 @@
+=== tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts ===
+declare var deco: any;
+>deco : any
+
+@deco
+>deco : any
+
+export class Example {
+>Example : Example
+
+    static foo() {}
+>foo : () => void
+}
+
+export namespace Example {
+>Example : typeof Example
+
+    export const x = 1;
+>x : 1
+>1 : 1
+}
+
+Example.foo();
+>Example.foo() : void
+>Example.foo : () => void
+>Example : typeof Example
+>foo : () => void
+

tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-commonjs-classNamespaceMerge.ts

@@ -0,0 +1,15 @@
+// @target: es2022
+// @module: commonjs
+
+declare var deco: any;
+
+@deco
+export class Example {
+    static foo() {}
+}
+
+export namespace Example {
+    export const x = 1;
+}
+
+Example.foo();