Merge branch 'main' of github.com:joggrdocs/tempo into feature/expose…

…-types-n-arrays
joggrdocs · Jul 16, 2023 · 0bb1878 · 0bb1878
2 parents a271f14 + cca9bcf
commit 0bb1878
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -62,11 +62,11 @@ const result = tempo()
   .paragraph('Some things')
   .paragraph((txt) => 
     txt
-      .text('A sentence with')
+      .plainText('A sentence with')
       .bold('bolded words')
       .plainText('and')
       .italic('italicized words')
-      .append('.')
+      .plainText('.', { append: true })
       .build()
   )
   .h2((txt) => 
@@ -103,7 +103,7 @@ const result = tempo()
       .bold('bolded words')
       .plainText('and')
       .italic('italicized words')
-      .append('.')
+      .plainText('.', { append: true })
       .build()
   )
   .toJSON();

diff --git a/examples/lib/code.ts b/examples/lib/code.ts
@@ -7,7 +7,7 @@ function run() {
       txt
         .plainText('This includes examples of code blocks and')
         .code('inline code')
-        .append('.')
+        .plainText('.', { append: true })
     )
     .h2(txt => txt.plainText('This is a heading with ').code('code'))
     .codeBlock(

diff --git a/src/lib/Text.ts b/src/lib/Text.ts
@@ -34,6 +34,9 @@ interface BaseTextNode<T> {
 
 export interface PlainTextNode extends BaseTextNode<string> {
   type: 'plaintext';
+  options?: {
+    append?: boolean;
+  };
 }
 
 export interface AppendTextNode extends BaseTextNode<string> {
@@ -88,20 +91,12 @@ export type TextNode =
 export class Text {
   private nodes: TextNode[] = [];
 
-  public plainText(value: string) {
+  public plainText(value: string, options?: { append?: boolean }) {
     this.nodes.push({
       type: 'plaintext',
       data: value,
-      computed: value
-    });
-    return this;
-  }
-
-  public append(value: string) {
-    this.nodes.push({
-      type: 'append',
-      data: value,
-      computed: value
+      computed: value,
+      options
     });
     return this;
   }
@@ -177,12 +172,14 @@ export class Text {
     let output = '';
 
     for (const node of this.nodes) {
-      if (node.type === 'append') {
-        output += node.computed;
-        continue;
-      } else {
-        output += ` ${node.computed}`;
+      if (node.type === 'plaintext') {
+        if (node.options && node.options.append) {
+          output += node.computed;
+          continue;
+        }
       }
+
+      output += ` ${node.computed}`;
     }
 
     return output.trim();

diff --git a/src/lib/__tests__/Text.test.ts b/src/lib/__tests__/Text.test.ts
@@ -92,9 +92,9 @@ describe('outputs', () => {
       const value = 'Hello World';
       const txtReal = createText()
         .plainText(value)
-        .append(';')
+        .plainText(';', { append: true })
         .bold(value)
-        .append('/')
+        .plainText('/', { append: true })
         .italic(value)
         .strikeThrough(value)
         .link(value, value);