fix(importer): edge cases in word/document entrypoint

Author: Novout

packages/better-write-app/src/use/project.ts

@@ -205,13 +205,16 @@ export const useProject = () => {
     let pages = 0
 
     entities.forEach((entity) => {
-      if (entity.type === 'heading-one') {
+      if (entity.type === 'heading-one' || chapter === null) {
         if (chapter) {
           chapters.push(chapter)
 
           chapter = null
         }
 
+        // for edge case
+        entity.type = 'heading-one'
+
         pages++
 
         chapter = {
@@ -316,7 +319,13 @@ export const useProject = () => {
         if (isDoc) {
           const importers = await DocxToJson(reader.result as string)
 
-          onLoadImporter(importers, file.name)
+          onLoadImporter(
+            importers,
+            file.name
+              .replace('.bw', '')
+              .replace('.docx', '')
+              .replace('.doc', '')
+          )
 
           return
         }

packages/better-write-importer/src/docx.ts

@@ -3,68 +3,80 @@ import destr from 'destr'
 import { xml2json } from 'xml-js'
 import { EntityType, ImporterData, ImporterEntity } from 'better-write-types'
 
-const extractFilter = async (entries: zip.Entry[], position: number = 3) => {
+const extractFilter = async (
+  entries: zip.Entry[]
+): Promise<any[] | undefined> => {
+  const arr: any = []
+
   if (entries.length) {
-    const target = entries[position]
-
-    // @ts-ignore
-    const text = await target.getData(new zip.TextWriter())
-
-    const result = await xml2json(text, {
-      compact: true,
-      elementNameFn: (val) => {
-        return val.replace('w:', '').replace('_', '').replace('xml:', '')
-      },
-      ignoreComment: true,
-      ignoreDeclaration: true,
-      spaces: 2,
-    })
+    for (const target of entries) {
+      if (target.filename === 'word/document.xml') {
+        // @ts-ignore
+        const text = await target.getData(new zip.TextWriter())
+
+        const result = await xml2json(text, {
+          compact: true,
+          elementNameFn: (val) => {
+            return val.replace('w:', '').replace('_', '').replace('xml:', '')
+          },
+          ignoreComment: true,
+          ignoreDeclaration: true,
+          spaces: 2,
+        })
+
+        arr.push(destr(result))
+      }
+    }
 
-    return destr(result)
+    return arr
   }
+
+  return undefined
 }
 
-const DocxToBW = async (data: Record<string, any>): Promise<ImporterData> => {
+const DocxToBW = async (arr: Record<string, any>[]): Promise<ImporterData> => {
   const result: ImporterEntity[] = []
 
-  data.body.p.forEach((target: any) => {
-    const style = target?.pPr?.pStyle?._attributes['w:val']
-    const raw = target?.r?.t?._text
-
-    if (style && raw) {
-      let type: EntityType | null = null
-
-      switch (style) {
-        case 'Heading1':
-          type = 'heading-one'
-          break
-        case 'Heading2':
-          type = 'heading-two'
-          break
-        case 'Heading3':
-        case 'Heading4':
-        case 'Heading5':
-        case 'Heading6':
-          type = 'heading-three'
-          break
+  arr.forEach((data) => {
+    data?.document?.body?.p?.forEach((target: any) => {
+      const style = target?.pPr?.pStyle?._attributes['w:val']
+      const raw = target?.r?.t?._text
+
+      if (style && raw) {
+        let type: EntityType | null = null
+
+        switch (style) {
+          case 'Heading1':
+          case 'Heading2':
+            type = 'heading-one'
+            break
+          case 'Heading3':
+          case 'Heading4':
+            type = 'heading-two'
+            break
+          case 'Heading5':
+          case 'Heading6':
+            type = 'heading-three'
+            break
+        }
+
+        if (type) {
+          result.push({
+            type,
+            raw,
+          })
+        }
+
+        return
       }
 
-      if (type) {
+      if (raw) {
         result.push({
-          type,
+          type: 'paragraph',
           raw,
         })
       }
-
-      return
-    }
-
-    if (raw) {
-      result.push({
-        type: 'paragraph',
-        raw,
-      })
-    }
+    })
   })
 
   return {
@@ -77,11 +89,17 @@ export const DocxToJson = async (data: string): Promise<ImporterData> => {
 
   const entries = await reader.getEntries()
 
-  const { document } = await extractFilter(entries)
+  const arr = await extractFilter(entries)
 
   await reader.close()
 
-  const final = DocxToBW(document)
+  if (!arr) {
+    return {
+      entities: [],
+    }
+  }
+
+  const final = DocxToBW(arr)
 
   return final
 }