fix(generator): purge in heading's

Novout · Apr 26, 2022 · d838b5c · d838b5c
1 parent f18840b
commit d838b5c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/packages/better-write-app/src/use/start.ts b/packages/better-write-app/src/use/start.ts
@@ -41,6 +41,7 @@ import { Session } from '@supabase/supabase-js'
 import { computed, watch } from 'vue'
 import { useHead } from '@vueuse/head'
 import { useExternalsStore } from '@/store/externals'
+import { useSubstitution } from './tools/substitution'
 
 export const useStart = () => {
   const ABSOLUTE = useAbsoluteStore()
@@ -195,6 +196,7 @@ export const useStart = () => {
         utils: useUtils(),
         i18n: useI18n(),
         emitter: useEmitter(),
+        substitution: useSubstitution(),
       }
     )
     plugin.emit('plugin-pdf-init')

diff --git a/packages/better-write-plugin-docx/src/set.ts b/packages/better-write-plugin-docx/src/set.ts
@@ -18,7 +18,9 @@ export const PluginDocxSet = (
     const final: DocxPurge = []
     let set: false | 'bold' | 'italic' = false
 
-    const rest = raw.split(hooks.utils.regex().htmlTags())
+    const rest = hooks.substitution
+      .purge(raw)
+      .split(hooks.utils.regex().htmlTags())
 
     rest.forEach((content: string) => {
       // italic
@@ -174,7 +176,7 @@ export const PluginDocxSet = (
     const entities = () => {
       const headingOne = (raw: string) => {
         return new docx.Paragraph({
-          text: raw,
+          text: hooks.substitution.purge(raw),
           heading: docx.HeadingLevel.HEADING_1,
           alignment: docx.AlignmentType.CENTER,
           pageBreakBefore: true,
@@ -183,15 +185,15 @@ export const PluginDocxSet = (
 
       const headingTwo = (raw: string) => {
         return new docx.Paragraph({
-          text: raw,
+          text: hooks.substitution.purge(raw),
           heading: docx.HeadingLevel.HEADING_2,
           alignment: docx.AlignmentType.CENTER,
         })
       }
 
       const headingThree = (raw: string) => {
         return new docx.Paragraph({
-          text: raw,
+          text: hooks.substitution.purge(raw),
           heading: docx.HeadingLevel.HEADING_3,
           alignment: docx.AlignmentType.CENTER,
         })

diff --git a/packages/better-write-plugin-txt/src/set.ts b/packages/better-write-plugin-txt/src/set.ts
@@ -1,8 +1,7 @@
 import { saveAs } from 'file-saver'
-import { Entity, PluginTypes } from 'better-write-types'
+import { PluginTypes } from 'better-write-types'
 import { On } from 'better-write-plugin-core'
 import { useNProgress } from '@vueuse/integrations'
-import { ContextState } from 'better-write-types'
 
 export const PluginTxtSet = (
   emitter: PluginTypes.PluginEmitter,
@@ -12,7 +11,10 @@ export const PluginTxtSet = (
   const { isLoading } = useNProgress()
 
   const purge = (texts: string[]): string => {
-    return texts.reduce((conc, text) => conc + text + '\n', '')
+    return texts.reduce(
+      (conc, text) => hooks.substitution.purge(conc + text) + '\n',
+      ''
+    )
   }
 
   const download = (texts: string[]) => {

diff --git a/packages/better-write-types/src/types/plugin/core.ts b/packages/better-write-types/src/types/plugin/core.ts
@@ -100,6 +100,7 @@ export interface PluginHooks {
   utils: PluginHook
   i18n: PluginHook
   emitter: PluginHook
+  substitution: PluginHook
 }
 
 export type PluginContext = (