feat: Ability to set a DecoratorStructure's arguments using a writer …

…function.
dsherret · Apr 30, 2018 · 585793c · 585793c
1 parent e7e0158
commit 585793c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/structurePrinters/decorator/DecoratorStructurePrinter.ts b/src/structurePrinters/decorator/DecoratorStructurePrinter.ts
@@ -1,4 +1,5 @@
 import { CodeBlockWriter } from "../../codeBlockWriter";
+import { printTextFromStringOrWriter } from "../../utils";
 import { DecoratorStructure } from "../../structures";
 import { FactoryStructurePrinter } from "../FactoryStructurePrinter";
 
@@ -13,8 +14,19 @@ export class DecoratorStructurePrinter extends FactoryStructurePrinter<Decorator
 
     printText(writer: CodeBlockWriter, structure: DecoratorStructure) {
         writer.write(`@${structure.name}`);
-        if (structure.arguments != null)
-            writer.write(`(${structure.arguments.join(", ")})`);
+        this.printArguments(writer, structure);
+    }
+
+    printArguments(writer: CodeBlockWriter, structure: DecoratorStructure) {
+        if (structure.arguments == null)
+            return;
+
+        writer.write("(");
+        for (let i = 0; i < structure.arguments.length; i++) {
+            writer.conditionalWrite(i > 0, ", ");
+            printTextFromStringOrWriter(writer, structure.arguments[0]);
+        }
+        writer.write(")");
     }
 
     private printMultiple(writer: CodeBlockWriter, structures: DecoratorStructure[] | undefined, separator: () => void) {

diff --git a/src/structures/decorator/DecoratorStructure.ts b/src/structures/decorator/DecoratorStructure.ts
@@ -1,4 +1,6 @@
-export interface DecoratorStructure {
+import { CodeBlockWriter } from "../../codeBlockWriter";
+
+export interface DecoratorStructure {
     name: string;
-    arguments?: string[];
+    arguments?: (string | ((writer: CodeBlockWriter) => void))[];
 }
diff --git a/src/tests/compiler/base/decoratableNodeTests.ts b/src/tests/compiler/base/decoratableNodeTests.ts
@@ -66,7 +66,10 @@ describe(nameof(DecoratableNode), () => {
             });
 
             it("should insert with arguments", () => {
-                doTest("class MyClass {}", 0, [{ name: "dec", arguments: [] }, { name: "dec2", arguments: ["1"] }, { name: "dec3", arguments: ["1", "2"] }],
+                doTest("class MyClass {}", 0, [
+                        { name: "dec", arguments: [] }, { name: "dec2", arguments: ["1"] },
+                        { name: "dec3", arguments: ["1", writer => writer.write("2")] }
+                    ],
                     "@dec()\n@dec2(1)\n@dec3(1, 2)\nclass MyClass {}");
             });