feat: support raw object or raw string for text

Author: Novout

demo/src/main.ts

@@ -22,7 +22,8 @@ pdfeasy.add([
   { raw: 'A simple pdf', text: { font: 'Roboto' }},
   { lineBreak: {} },
   { raw: 'using...', text: {}, position: { x: 250, y: 0 } },
-  { raw: 'hm...', text: {} },
+  { raw: 'hm...' },
+  'aaaaa...',
   { pageBreak: {} },
   { raw: 'pdfeasy!', text: {} },
   { raw: 'a first in list...', list: { style: 'counter' } },

packages/core/src/resolvers.ts

@@ -51,6 +51,23 @@ export const resolveContent = async (
   globals: InternalGlobals,
   run: RunOptionsBase
 ) => {
+  const addOnlyStringText = async (str: string) => {
+    await app.text(str, {
+      indent: defaults.text.indent,
+      align: defaults.text.align,
+      paragraphGap: defaults.text.paragraphMargin,
+      lineGap: defaults.text.lineHeight,
+      destination: defaults.text.destination,
+      goTo: defaults.text.go,
+    })
+  }
+
+  if (typeof content === 'string') {
+    await addOnlyStringText(content)
+
+    return
+  }
+
   const possibleLastPos = globals.__LAST_POSITION__
 
   let position = content?.position
@@ -65,7 +82,13 @@ export const resolveContent = async (
   const addStack = async () => {
     const stack = content.stack as Content[]
 
-    await stack.forEach((entity) => {
+    await stack.forEach(async (entity) => {
+      if (typeof entity === 'string') {
+        await addOnlyStringText(entity)
+
+        return
+      }
+
       if (!entity.text || !entity.raw) return
 
       const isLast = stack.length - 1 === stack.indexOf(entity)
@@ -359,6 +382,25 @@ export const resolveContent = async (
     return
   }
 
+  if (
+    !content.stack &&
+    !content.text &&
+    !content.image &&
+    !content.svg &&
+    !content.lineBreak &&
+    !content.pageBreak &&
+    !content.table &&
+    !content.form &&
+    !content.checkbox &&
+    !content.position &&
+    !content.qrcode &&
+    content.raw
+  ) {
+    addSimpleText()
+
+    return
+  }
+
   if (content.stack) await addStack()
   if (content.text) await addText()
   if (content.image || content.svg) await addImage()

packages/core/src/runner.ts

@@ -112,11 +112,20 @@ export class PDFEasy {
   }
 
   private posUpdateContent = (content: Content) => {
+    if (typeof content === 'string') {
+      this.globals.__LAST_CONTENT__ = { raw: content, text: {} }
+      this.globals.__LAST_POSITION__ = null
+
+      return
+    }
+
     this.globals.__LAST_CONTENT__ = content
     this.globals.__LAST_POSITION__ = content.position || null
   }
 
   private getType = (content: Content): ItemType => {
+    if (typeof content === 'string') return 'paragraph'
+
     if (content.checkbox) return 'checkbox'
     if (content.list) return 'list'
     if (content.lineBreak) return 'line-break'

packages/core/src/types.ts

@@ -177,7 +177,7 @@ export interface InternalGlobals {
     __BACKGROUND_RAW__: string
   }
   __LAST_TYPE__: [ItemType, number]
-  __LAST_CONTENT__: Record<any, any>
+  __LAST_CONTENT__: Record<any, any> | string
   __LAST_POSITION__: { x: number; y: number } | null
 }
 
@@ -294,7 +294,7 @@ export interface ContentFormulary<T extends ContentFormularyType> {
     : never
 }
 
-export interface Content {
+export interface ContentObject {
   raw?: string
   position?: { x: number; y: number }
   stack?: Content[]
@@ -310,6 +310,8 @@ export interface Content {
   qrcode?: ContentQRCode
 }
 
+export type Content = ContentObject | string
+
 export interface PDFEasyDefaults {
   text: DefaultsText
   lineBreak: DefaultsLineBreak