Merge pull request #27175 from a-tarasyuk/bug/error-using-declaration-dir-with-composite

#26862: allow using declarationDir with composite option

Author: sheetalkamat

Diff for: src/compiler/program.ts

@@ -2532,7 +2532,7 @@ namespace ts {
             }
 
             if (options.declarationDir) {
-                if (!options.declaration) {
+                if (!getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration");
                 }
                 if (options.out || options.outFile) {

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithCompositeOption.js

@@ -0,0 +1,17 @@
+//// [test.ts]
+interface Foo {
+    x: number;
+}
+export default Foo;
+
+
+//// [test.js]
+"use strict";
+exports.__esModule = true;
+
+
+//// [test.d.ts]
+interface Foo {
+    x: number;
+}
+export default Foo;

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithCompositeOption.symbols

@@ -0,0 +1,10 @@
+=== /foo/test.ts ===
+interface Foo {
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+
+    x: number;
+>x : Symbol(Foo.x, Decl(test.ts, 0, 15))
+}
+export default Foo;
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithCompositeOption.types

@@ -0,0 +1,8 @@
+=== /foo/test.ts ===
+interface Foo {
+    x: number;
+>x : number
+}
+export default Foo;
+>Foo : Foo
+

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js

@@ -0,0 +1,17 @@
+//// [test.ts]
+interface Foo {
+    x: number;
+}
+export default Foo;
+
+
+//// [test.js]
+"use strict";
+exports.__esModule = true;
+
+
+//// [test.d.ts]
+interface Foo {
+    x: number;
+}
+export default Foo;

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.symbols

@@ -0,0 +1,10 @@
+=== /foo/test.ts ===
+interface Foo {
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+
+    x: number;
+>x : Symbol(Foo.x, Decl(test.ts, 0, 15))
+}
+export default Foo;
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.types

@@ -0,0 +1,8 @@
+=== /foo/test.ts ===
+interface Foo {
+    x: number;
+>x : number
+}
+export default Foo;
+>Foo : Foo
+

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithoutCompositeAndDeclarationOptions.errors.txt

@@ -0,0 +1,16 @@
+/foo/tsconfig.json(2,26): error TS5052: Option 'declarationDir' cannot be specified without specifying option 'declaration'.
+
+
+==== /foo/tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": { "declarationDir": "out" }
+                             ~~~~~~~~~~~~~~~~
+!!! error TS5052: Option 'declarationDir' cannot be specified without specifying option 'declaration'.
+    }
+    
+==== /foo/test.ts (0 errors) ====
+    interface Foo {
+        x: number;
+    }
+    export default Foo;
+    

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithoutCompositeAndDeclarationOptions.js

@@ -0,0 +1,10 @@
+//// [test.ts]
+interface Foo {
+    x: number;
+}
+export default Foo;
+
+
+//// [test.js]
+"use strict";
+exports.__esModule = true;

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithoutCompositeAndDeclarationOptions.symbols

@@ -0,0 +1,10 @@
+=== /foo/test.ts ===
+interface Foo {
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+
+    x: number;
+>x : Symbol(Foo.x, Decl(test.ts, 0, 15))
+}
+export default Foo;
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+

Diff for: tests/baselines/reference/declarationEmitToDeclarationDirWithoutCompositeAndDeclarationOptions.types

@@ -0,0 +1,8 @@
+=== /foo/test.ts ===
+interface Foo {
+    x: number;
+>x : number
+}
+export default Foo;
+>Foo : Foo
+

Diff for: tests/cases/compiler/declarationEmitToDeclarationDirWithCompositeOption.ts

@@ -0,0 +1,11 @@
+// @composite: true
+// @filename: /foo/tsconfig.json
+{
+    "compilerOptions": { "composite": true, "declarationDir": "out" }
+}
+
+// @filename: /foo/test.ts
+interface Foo {
+    x: number;
+}
+export default Foo;

Diff for: tests/cases/compiler/declarationEmitToDeclarationDirWithDeclarationOption.ts

@@ -0,0 +1,11 @@
+// @declaration: true
+// @filename: /foo/tsconfig.json
+{
+    "compilerOptions": { "declaration": true, "declarationDir": "out" }
+}
+
+// @filename: /foo/test.ts
+interface Foo {
+    x: number;
+}
+export default Foo;

Diff for: tests/cases/compiler/declarationEmitToDeclarationDirWithoutCompositeAndDeclarationOptions.ts

@@ -0,0 +1,10 @@
+// @filename: /foo/tsconfig.json
+{
+    "compilerOptions": { "declarationDir": "out" }
+}
+
+// @filename: /foo/test.ts
+interface Foo {
+    x: number;
+}
+export default Foo;